[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Matt Robinson]

The following commit has been merged in the experimental branch:
commit b9f3847cd2c7efb954f428224d8d721f9edafd64
Author: Matt Robinson <matt at puppetlabs.com>
Date:   Mon Dec 6 11:57:54 2010 -0800

    maint: Fix more order dependent test failures
    
    In commit b67f4c68503ca3abf0a55857da452e46fa75abd5 I fixed one place
    that was causing order dependent test failures in
    spec/unit/ssl/certificate_request_spec.rb, but missed another case that
    was causing a similar failure.  To find all the order dependent failures
    with that file I ran the following bash script from the spec directory:
    
    for TEST in `find . -name "*.rb" -type f`; do
      spec $TEST unit/ssl/certificate_request_spec.rb > /dev/null 2>&1
      if [[ $? != 0 ]]; then
        echo $TEST
      fi
    done
    
    Paired-with: Jesse Wolfe

diff --git a/spec/unit/application/master_spec.rb b/spec/unit/application/master_spec.rb
index 86e38ef..e97bcb5 100644
--- a/spec/unit/application/master_spec.rb
+++ b/spec/unit/application/master_spec.rb
@@ -20,6 +20,7 @@ describe Puppet::Application::Master do
     Puppet::Node::Facts.indirection.stubs(:cache_class=)
     Puppet::Transaction::Report.indirection.stubs(:terminus_class=)
     Puppet::Resource::Catalog.indirection.stubs(:terminus_class=)
+    Puppet::SSL::Host.stubs(:ca_location=)
   end
 
   it "should operate in master run_mode" do
diff --git a/spec/unit/ssl/certificate_request_spec.rb b/spec/unit/ssl/certificate_request_spec.rb
index fb4b5a1..3a21307 100755
--- a/spec/unit/ssl/certificate_request_spec.rb
+++ b/spec/unit/ssl/certificate_request_spec.rb
@@ -195,7 +195,7 @@ describe Puppet::SSL::CertificateRequest do
         csr = Puppet::SSL::CertificateRequest.new("me")
         terminus = mock 'terminus'
         Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus)
-        terminus.expects(:save).with { |request| puts request.key.inspect; request.instance == csr && request.key == "me" }
+        terminus.expects(:save).with { |request| request.instance == csr && request.key == "me" }
 
         Puppet::SSL::CertificateRequest.indirection.save(csr)
       end
@@ -208,7 +208,7 @@ describe Puppet::SSL::CertificateRequest do
         csr = Puppet::SSL::CertificateRequest.new("me")
         terminus = mock 'terminus'
         Puppet::SSL::CertificateRequest.indirection.expects(:prepare).returns(terminus)
-        terminus.expects(:save).with { |request| puts request.key.inspect; request.instance == csr && request.key == "me" }
+        terminus.expects(:save).with { |request| request.instance == csr && request.key == "me" }
 
         Puppet::SSL::CertificateRequest.indirection.save(csr)
       end

-- 
Puppet packaging for Debian