From: Daniel Pittman <[email protected]>
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.
---
spec/unit/provider/mount/parsed_spec.rb | 11 ++++++++---
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 3bc5b98..e8a862f 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
--
1.7.4.1
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
