[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc3-129-g74f8285

[James Turnbull]

The following commit has been merged in the upstream branch:
commit fa4d32cfd7b35f9c80ebb8c92b5e00ff70a27181
Author: Markus Roberts <Markus at reality.com>
Date:   Mon Sep 6 19:48:45 2010 -0700

    Fix for #4646 -- Missing stub
    
    The test was expecting a stub object but wasn't providing one.

diff --git a/spec/unit/application/apply_spec.rb b/spec/unit/application/apply_spec.rb
index 8c53136..85098f4 100755
--- a/spec/unit/application/apply_spec.rb
+++ b/spec/unit/application/apply_spec.rb
@@ -312,7 +312,7 @@ describe Puppet::Application::Apply do
       end
 
       it "should apply the catalog" do
-        @catalog.expects(:apply)
+        @catalog.expects(:apply).returns(stub_everything 'transaction')
 
         @apply.main
       end

-- 
Puppet packaging for Debian