[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit b6f4291cf4be7fd06839415e818796d47e89cf35
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Dec 17 15:45:46 2009 -0800

    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 at gmail.com>

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

-- 
Puppet packaging for Debian