summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Pittman <daniel@rimspace.net>2011-03-08 16:38:02 -0800
committerDaniel Pittman <daniel@rimspace.net>2011-03-08 17:15:18 -0800
commit6a96584ea92afc83383dad85d1a2db956a58c323 (patch)
tree0577df6ba558e42856d71975539557e72a765fb1
parentb4f1b9891fead7c79f13e639df433e65340c950b (diff)
downloadpuppet-6a96584ea92afc83383dad85d1a2db956a58c323.tar.gz
puppet-6a96584ea92afc83383dad85d1a2db956a58c323.tar.xz
puppet-6a96584ea92afc83383dad85d1a2db956a58c323.zip
(#6441) Mark solaris tests pending, because we can't stub it.
In the final combination test we need to mark Solaris pending, because we genuinely have a bug where we can't test due to stubbing order.
-rwxr-xr-xspec/unit/provider/mount/parsed_spec.rb11
1 files changed, 8 insertions, 3 deletions
diff --git a/spec/unit/provider/mount/parsed_spec.rb b/spec/unit/provider/mount/parsed_spec.rb
index 3bc5b9864..e8a862fdb 100755
--- a/spec/unit/provider/mount/parsed_spec.rb
+++ b/spec/unit/provider/mount/parsed_spec.rb
@@ -193,8 +193,13 @@ FSTAB
platform = File.basename(fstab, '.fstab')
describe "when prefetching on #{platform}" do
before :each do
- pending "solaris seems ... odd" if platform == "solaris"
- @platform = platform
+ if Facter[:operatingsystem] == "Solaris" then
+ platform == 'solaris' or
+ pending "We need to stub the operatingsystem fact at load time, but can't"
+ else
+ platform != 'solaris' or
+ pending "We need to stub the operatingsystem fact at load time, but can't"
+ end
# Note: we have to stub default_target before creating resources
# because it is used by Puppet::Type::Mount.new to populate the
@@ -212,7 +217,7 @@ FSTAB
@resource_hash[resource.name] = resource
end
- @provider.stubs(:mountcmd).returns File.read(my_fixture(@platform + '.mount'))
+ @provider.stubs(:mountcmd).returns File.read(my_fixture(platform + '.mount'))
end
it "should set :ensure to :unmounted if found in fstab but not mounted" do