diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-17 15:45:46 -0800 |
|---|---|---|
| committer | Jesse Wolfe <jes5199@gmail.com> | 2009-12-17 15:50:14 -0800 |
| commit | b6f4291cf4be7fd06839415e818796d47e89cf35 (patch) | |
| tree | 568d2e88b26bf1e10557ffe6454eda1cadc97cdb | |
| parent | bf7c108825ffdb5ea89cf3e500d55d27ab64b8d2 (diff) | |
| download | puppet-b6f4291cf4be7fd06839415e818796d47e89cf35.tar.gz puppet-b6f4291cf4be7fd06839415e818796d47e89cf35.tar.xz puppet-b6f4291cf4be7fd06839415e818796d47e89cf35.zip | |
Fix #2923 failing tests in spec/unit/ssl/host.rb
The fix for #2661 changed the behavior of Puppet::SSL::Host enough to
confuse these mocks.
Signed-off-by: Jesse Wolfe <jes5199@gmail.com>
| -rwxr-xr-x | spec/unit/ssl/host.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/unit/ssl/host.rb b/spec/unit/ssl/host.rb index 38a1f3ed9..4e4d3f570 100755 --- a/spec/unit/ssl/host.rb +++ b/spec/unit/ssl/host.rb @@ -654,14 +654,14 @@ describe Puppet::SSL::Host do it "should catch and log errors during CSR saving" do @host.expects(:certificate).times(2).returns(nil).then.returns "foo" - @host.expects(:generate).times(2).raises(RuntimeError).then.returns nil + @host.expects(:generate).raises(RuntimeError) @host.stubs(:sleep) @host.wait_for_cert(1) end it "should sleep and retry after failures saving the CSR if waitforcert is enabled" do @host.expects(:certificate).times(2).returns(nil).then.returns "foo" - @host.expects(:generate).times(2).raises(RuntimeError).then.returns nil + @host.expects(:generate).raises(RuntimeError) @host.expects(:sleep).with(1) @host.wait_for_cert(1) end |
