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

[Nick Lewis]

The following commit has been merged in the experimental branch:
commit f663182c28c9d4533ad4c2f897e5fbbf78b16d8e
Merge: c7764723578ae64240db7bd2a64f8e6e9fa708ab b16e10dba6606b808ef195f4b57f2e8c66cf65ab
Author: Nick Lewis <nick at puppetlabs.com>
Date:   Thu Jan 6 15:56:31 2011 -0800

    Merge branch 'intermediate_merge_branch' into next

diff --combined spec/unit/application/apply_spec.rb
index 6451195,8aaa5d8..9485ed2
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@@ -177,7 -177,7 +177,7 @@@ describe Puppet::Application::Apply d
      describe "the main command" do
        before :each do
          Puppet.stubs(:[])
 -        Puppet.settings.stubs(:use)
 +        Puppet::Util::Settings.any_instance.stubs(:use)
          Puppet.stubs(:[]).with(:prerun_command).returns ""
          Puppet.stubs(:[]).with(:postrun_command).returns ""
          Puppet.stubs(:[]).with(:trace).returns(true)
@@@ -325,8 -325,8 +325,8 @@@
  
        it "should save the last run summary" do
          Puppet.stubs(:[]).with(:noop).returns(false)
-         report = stub 'report'
-         Puppet::Configurer.any_instance.stubs(:initialize_report).returns(report)
+         report = Puppet::Transaction::Report.new("apply")
+         Puppet::Transaction::Report.stubs(:new).returns(report)
  
          Puppet::Configurer.any_instance.expects(:save_last_run_summary).with(report)
          @apply.main
diff --combined spec/unit/application/master_spec.rb
index ea52b2f,1173752..1cf06ff
--- a/spec/unit/application/master_spec.rb
+++ b/spec/unit/application/master_spec.rb
@@@ -119,7 -119,7 +119,7 @@@ describe Puppet::Application::Master d
        Puppet::Log.stubs(:level=)
        Puppet::SSL::CertificateAuthority.stubs(:instance)
        Puppet::SSL::CertificateAuthority.stubs(:ca?)
 -      Puppet.settings.stubs(:use)
 +      Puppet::Util::Settings.any_instance.stubs(:use)
  
        @master.options.stubs(:[]).with(any_parameters)
      end
@@@ -183,14 -183,6 +183,14 @@@
        @master.setup
      end
  
 +    it "mocha work-around" do
 +      # Mocha 0.9.10 and earlier leaves behind a bogus "use" method
 +      # See https://github.com/floehopper/mocha/issues#issue/20
 +      class << Puppet.settings
 +        remove_method :use rescue nil
 +      end
 +    end
 +
      it "should cache class in yaml" do
        Puppet::Node.indirection.expects(:cache_class=).with(:yaml)
  
@@@ -220,20 -212,11 +220,20 @@@
        end
  
        it "should tell Puppet.settings to use :ca category" do
 +        Puppet.settings.stubs(:use)
          Puppet.settings.expects(:use).with(:ca)
  
          @master.setup
        end
  
 +      it "mocha work-around" do
 +        # Mocha 0.9.10 and earlier leaves behind a bogus "use" method
 +        # See https://github.com/floehopper/mocha/issues#issue/20
 +        class << Puppet.settings
 +          remove_method :use rescue nil
 +        end
 +      end
 +
        it "should instantiate the CertificateAuthority singleton" do
          Puppet::SSL::CertificateAuthority.expects(:instance)
  
@@@ -429,9 -412,7 +429,7 @@@
          @master.main
        end
  
-       describe "with --rack" do
-         confine "Rack is not available" => Puppet.features.rack?
- 
+       describe "with --rack", :if => Puppet.features.rack? do
          before do
            require 'puppet/network/http/rack'
            Puppet::Network::HTTP::Rack.stubs(:new).returns(@app)

-- 
Puppet packaging for Debian