[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

[test branch]

The following commit has been merged in the upstream branch:
commit a15a70c7cda9962e56b16ed7129bf6772f1df038
Author: Markus Roberts <Markus at reality.com>
Date:   Tue May 18 11:58:35 2010 -0700

    Fixing tests broken by conceptual merge conflicts
    
    A minor api change and an even less significant variable name change in earlier
    commits broke two test.

diff --git a/spec/unit/application/cert.rb b/spec/unit/application/cert.rb
index 66c6aea..ba6ba1d 100644
--- a/spec/unit/application/cert.rb
+++ b/spec/unit/application/cert.rb
@@ -56,8 +56,8 @@ describe Puppet::Application::Cert do
     end
 
     it "should set signed to true for --signed" do
-        @puppetca.handle_signed(0)
-        @puppetca.signed.should be_true
+        @cert_app.handle_signed(0)
+        @cert_app.signed.should be_true
     end
     
     Puppet::SSL::CertificateAuthority::Interface::INTERFACE_METHODS.reject { |m| m == :destroy }.each do |method|
diff --git a/spec/unit/ssl/certificate_authority/interface.rb b/spec/unit/ssl/certificate_authority/interface.rb
index d38e31b..f3b9107 100755
--- a/spec/unit/ssl/certificate_authority/interface.rb
+++ b/spec/unit/ssl/certificate_authority/interface.rb
@@ -219,7 +219,7 @@ describe Puppet::SSL::CertificateAuthority::Interface do
                 it "should print a string containing all signed certificate requests and certificates" do
                     @ca.expects(:list).returns %w{host1 host2}
 
-                    @applier = @class.new(:list, :signed)
+                    @applier = @class.new(:list, :to => :signed)
 
                     @applier.apply(@ca)
                 end

-- 
Puppet packaging for Debian