summaryrefslogtreecommitdiffstats
path: root/test/providers
diff options
context:
space:
mode:
authorluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-29 00:47:56 +0000
committerluke <luke@980ebf18-57e1-0310-9a29-db15c13687c0>2007-01-29 00:47:56 +0000
commit3aff4a0e9debfe22bd2a4b024b89410f481d09f7 (patch)
tree0ed07fa4b165118dd189cce04af4d0996c215f34 /test/providers
parent1cc8ecb0640420d6eb7a66fcb0d282337a263b84 (diff)
Doing more work on #113. Mostly, just making sure remounts do not happen spuriously very often. They will still have extra remounts when changing the value of "ensure", but that is not currently avoidable (similar to #199).
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2109 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'test/providers')
-rwxr-xr-xtest/providers/mount/parsed.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/test/providers/mount/parsed.rb b/test/providers/mount/parsed.rb
index 8c60c9626..c062960f3 100755
--- a/test/providers/mount/parsed.rb
+++ b/test/providers/mount/parsed.rb
@@ -147,7 +147,7 @@ class TestParsedMounts < Test::Unit::TestCase
end
end
- if Puppet::SUIDManager.uid == 0
+ if Puppet::SUIDManager.uid == 0 and Facter.value(:operatingsystem) != "Darwin"
def test_mountfs
fs = nil
case Facter.value(:hostname)
@@ -197,6 +197,10 @@ class TestParsedMounts < Test::Unit::TestCase
assert(obj.mounted?, "FS not mounted")
assert(obj.df().include?(fs), "%s is not listed in df" % fs)
+ # Now try remounting
+ assert_nothing_raised("Could not remount filesystem") do
+ obj.remount
+ end
end
end