summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2014-05-23 16:34:49 -0700
committerLamont Granquist <lamont@scriptkiddie.org>2014-05-28 16:59:27 -0700
commiteecd604b754817ca51a229e597e62230ffe609cc (patch)
tree4f190f71321c04eb73952c113cc5e2932c788ad6
parenteb5cea889f7916f4fec9a25b545faf16e8f4aeaf (diff)
downloadchef-eecd604b754817ca51a229e597e62230ffe609cc.tar.gz
fix spec test
also drop the loop down to 0.1 sleep
-rw-r--r--lib/chef/provider/mount.rb2
-rw-r--r--spec/unit/provider/mount_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/provider/mount.rb b/lib/chef/provider/mount.rb
index 6f132e44d4..34b924d3c6 100644
--- a/lib/chef/provider/mount.rb
+++ b/lib/chef/provider/mount.rb
@@ -69,7 +69,7 @@ class Chef
umount_fs
Chef::Log.info("#{new_resource} unmounted")
end
- sleep 1 while mounted?
+ sleep 0.1 while mounted?
converge_by("mount #{current_resource.device}") do
mount_fs
Chef::Log.info("#{new_resource} mounted")
diff --git a/spec/unit/provider/mount_spec.rb b/spec/unit/provider/mount_spec.rb
index 3f0bbb74bf..9181595c7f 100644
--- a/spec/unit/provider/mount_spec.rb
+++ b/spec/unit/provider/mount_spec.rb
@@ -114,6 +114,7 @@ describe Chef::Provider::Mount do
it "should try a umount/remount of the filesystem" do
expect(provider).to receive(:umount_fs)
+ expect(provider).to receive(:mounted?).and_return(true, false)
expect(provider).to receive(:mount_fs)
provider.run_action(:remount)
expect(new_resource).to be_updated_by_last_action