summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Cooper <josh@puppetlabs.com>2011-08-04 16:41:11 -0700
committerJacob Helwig <jacob@puppetlabs.com>2011-08-19 13:52:59 -0700
commit80092091fb986eb013a12045cdb5f0efe3490702 (patch)
treeb628691a61d99e5f87dac9541c3121300067bd36
parenta0013e4b2d802f7d10e913da9b89ea912b1564bd (diff)
downloadpuppet-80092091fb986eb013a12045cdb5f0efe3490702.tar.gz
puppet-80092091fb986eb013a12045cdb5f0efe3490702.tar.xz
puppet-80092091fb986eb013a12045cdb5f0efe3490702.zip
(#8663) Exclude git rev-parse HEAD spec test on Windows
When running spec/integration/parser/compiler_spec.rb, the git command passed to Puppet::Util.execute is an array containing a single string ["git rev-parse HEAD"]. On Unix, it calls Kernel.exec(*command), but on Windows it calls Process.create(:command_line =>command), which attempts to execute the program called "git rev-parse HEAD" and fails: CreateProcess() failed: The system cannot find the file specified. This commit marks the test as fails_on_windows, and will be re-enabled when #8410 is fixed. Reviewed-by: Nick Lewis <nick@puppetlabs.com> (cherry picked from commit 7ca187509ce954e5b2707212a5615dbb9eb20378)
-rwxr-xr-xspec/integration/parser/compiler_spec.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/integration/parser/compiler_spec.rb b/spec/integration/parser/compiler_spec.rb
index 9f6aae907..582882d83 100755
--- a/spec/integration/parser/compiler_spec.rb
+++ b/spec/integration/parser/compiler_spec.rb
@@ -13,11 +13,12 @@ describe Puppet::Parser::Compiler do
Puppet.settings.clear
end
- it "should be able to determine the configuration version from a local version control repository" do
+ it "should be able to determine the configuration version from a local version control repository", :fails_on_windows => true do
# This should always work, because we should always be
# in the puppet repo when we run this.
version = %x{git rev-parse HEAD}.chomp
+ # REMIND: this fails on Windows due to #8410, re-enable the test when it is fixed
Puppet.settings[:config_version] = 'git rev-parse HEAD'
@parser = Puppet::Parser::Parser.new "development"