diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-08-04 16:50:20 -0700 |
|---|---|---|
| committer | Josh Cooper <josh@puppetlabs.com> | 2011-08-04 16:50:20 -0700 |
| commit | 3fde2a6e3176f346e8727291ec2c53eac93ff0cb (patch) | |
| tree | 7da50654683d450f2155511c349bc9aedf9ea2c8 | |
| parent | e45f08bf1fef8842554ca0d8cb6fb13711e888e7 (diff) | |
| parent | 7ca187509ce954e5b2707212a5615dbb9eb20378 (diff) | |
| download | puppet-3fde2a6e3176f346e8727291ec2c53eac93ff0cb.tar.gz puppet-3fde2a6e3176f346e8727291ec2c53eac93ff0cb.tar.xz puppet-3fde2a6e3176f346e8727291ec2c53eac93ff0cb.zip | |
Merge branch 'ticket/master/8663-windows-spec-tests'
* ticket/master/8663-windows-spec-tests:
(#8663) Exclude git rev-parse HEAD spec test on Windows
| -rwxr-xr-x | spec/integration/parser/compiler_spec.rb | 3 |
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" |