diff options
author | Paul Berry <paul@puppetlabs.com> | 2011-02-25 15:14:26 -0800 |
---|---|---|
committer | Paul Berry <paul@puppetlabs.com> | 2011-02-25 15:14:26 -0800 |
commit | a949a83c4f100be0254fadcb915f418f73705861 (patch) | |
tree | 9dc03431bd00fb2293bd6397a1dadae5d10461d6 /spec/unit/provider/mount | |
parent | 96e9f8f4feab5d768fff304fdb129405596ba128 (diff) | |
download | puppet-a949a83c4f100be0254fadcb915f418f73705861.tar.gz puppet-a949a83c4f100be0254fadcb915f418f73705861.tar.xz puppet-a949a83c4f100be0254fadcb915f418f73705861.zip |
Revert "(#6309) Ensure the correct device is mounted when managing mounts"
This reverts commit 6cb365a887d47606bdfae0ff540038b0c49b7451, which
fixed bug #6309 but introduced bug #6411. In addition, it conflicts
with a significant patch to the mount provider that addresses #4914.
After merging in the fix for #4914 I will determine whether bug #6309
still exists, and if so work on an improved fix for it.
Diffstat (limited to 'spec/unit/provider/mount')
-rwxr-xr-x | spec/unit/provider/mount/parsed_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/provider/mount/parsed_spec.rb b/spec/unit/provider/mount/parsed_spec.rb index 069d9495a..b4c2249fd 100755 --- a/spec/unit/provider/mount/parsed_spec.rb +++ b/spec/unit/provider/mount/parsed_spec.rb @@ -130,7 +130,7 @@ describe provider_class do mount.stubs(:mountcmd) # just so we don't actually try to mount anything mount.expects(:flush) - mount.mount! + mount.mount end end @@ -176,7 +176,7 @@ describe provider_class do it "should determine that the root fs is mounted" do @provider_class.prefetch("/" => @mount) - @mount.provider.should be_anything_mounted + @mount.provider.should be_mounted end end end |