diff options
| author | Josh Cooper <josh@puppetlabs.com> | 2011-07-27 17:04:45 -0700 |
|---|---|---|
| committer | Jacob Helwig <jacob@puppetlabs.com> | 2011-08-19 13:52:57 -0700 |
| commit | 925af9586a0e209a031c46c81225c6925837a49a (patch) | |
| tree | 0d74b67dab9aca61b9342e2c4a6dc4de67d9c133 /spec/integration | |
| parent | 04965d7d7a9cd34265d41c5870e6043ff24b3e4d (diff) | |
| download | puppet-925af9586a0e209a031c46c81225c6925837a49a.tar.gz puppet-925af9586a0e209a031c46c81225c6925837a49a.tar.xz puppet-925af9586a0e209a031c46c81225c6925837a49a.zip | |
(#8663) Disable spec tests for unsupported functionality on Windows
The mount, shell, and ssh_authorized_key types are not supported on
Windows, so these spec tests have been disabled when running on
Windows.
One of the compiler spec tests fails on Windows because
Puppet::Util.execute attempts to execute a program named "git rev-parse
HEAD". This has different semantics than Unix, where the command is
splatted, Kernel.exec(*command). Since this truly is a Windows bug, I
removed the fails_on_windows tag and updated ticket #8410.
Reviewed-by: Jacob Helwig <jacob@puppetlabs.com>
(cherry picked from commit d9ce88d10707268fe41c8f3ad1166137fe8e202f)
Diffstat (limited to 'spec/integration')
| -rwxr-xr-x | spec/integration/parser/compiler_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/provider/mount_spec.rb | 2 | ||||
| -rwxr-xr-x | spec/integration/provider/ssh_authorized_key_spec.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/spec/integration/parser/compiler_spec.rb b/spec/integration/parser/compiler_spec.rb index 51611f888..9f6aae907 100755 --- a/spec/integration/parser/compiler_spec.rb +++ b/spec/integration/parser/compiler_spec.rb @@ -13,7 +13,7 @@ describe Puppet::Parser::Compiler do Puppet.settings.clear end - it "should be able to determine the configuration version from a local version control repository", :fails_on_windows => true do + it "should be able to determine the configuration version from a local version control repository" 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 diff --git a/spec/integration/provider/mount_spec.rb b/spec/integration/provider/mount_spec.rb index eb8cc134a..b2e9c4497 100755 --- a/spec/integration/provider/mount_spec.rb +++ b/spec/integration/provider/mount_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' require 'puppet/file_bucket/dipper' -describe "mount provider (integration)", :fails_on_windows => true do +describe "mount provider (integration)", :unless => Puppet.features.microsoft_windows? do include PuppetSpec::Files def create_fake_fstab(initially_contains_entry) diff --git a/spec/integration/provider/ssh_authorized_key_spec.rb b/spec/integration/provider/ssh_authorized_key_spec.rb index f7f61ab25..252f7bf78 100755 --- a/spec/integration/provider/ssh_authorized_key_spec.rb +++ b/spec/integration/provider/ssh_authorized_key_spec.rb @@ -3,7 +3,7 @@ require 'spec_helper' require 'puppet/file_bucket/dipper' -describe "ssh_authorized_key provider (integration)", :fails_on_windows => true do +describe "ssh_authorized_key provider (integration)", :unless => Puppet.features.microsoft_windows? do include PuppetSpec::Files before :each do |