The fix for #2661 changed the behavior of Puppet::SSL::Host enough to
confuse these mocks.

Signed-off-by: Jesse Wolfe <[email protected]>
---
 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 38a1f3e..4e4d3f5 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
-- 
1.6.5

--

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.


Reply via email to