[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[James Turnbull]

The following commit has been merged in the upstream branch:
commit 0a0923c9636569fa5868ebd13233949cf90736f0
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Tue Jun 15 15:33:01 2010 -0700

    [#4006] Fix test failures caused by reverting ticket 2890
    
    When Markus reverted changes made by 2890 he reintroduced a
    method certificate_matches_key? that then caused failures in
    network/xmlrpc/client.rb.  I just stubbed that method to return true
    since the failing tests weren't trying to test that methods behavior.
    
    Reviewed-by: Markus Roberts

diff --git a/spec/unit/network/xmlrpc/client.rb b/spec/unit/network/xmlrpc/client.rb
index 328688b..1b97583 100755
--- a/spec/unit/network/xmlrpc/client.rb
+++ b/spec/unit/network/xmlrpc/client.rb
@@ -5,9 +5,9 @@ Dir.chdir(File.dirname(__FILE__)) { (s = lambda { |f| File.exist?(f) ? require(f
 describe Puppet::Network::XMLRPCClient do
     describe "when performing the rpc call" do
         before do
+            Puppet::SSL::Host.any_instance.stubs(:certificate_matches_key?).returns true
             @client = Puppet::Network::Client.report.xmlrpc_client.new
             @client.stubs(:call).returns "foo"
-
         end
 
         it "should call the specified namespace and method, with the specified arguments" do

-- 
Puppet packaging for Debian