[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08

[James Turnbull]

The following commit has been merged in the upstream branch:
commit eaab789ee08d3cc53b649a78d3cfe0ca833d2285
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Sat Nov 14 18:12:48 2009 +0100

    Fix failing tests introduced by #2797
    
    Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>

diff --git a/spec/unit/transaction.rb b/spec/unit/transaction.rb
index b419d4e..ff01eac 100755
--- a/spec/unit/transaction.rb
+++ b/spec/unit/transaction.rb
@@ -20,8 +20,8 @@ describe Puppet::Transaction do
 
     describe "when generating resources" do
         it "should finish all resources" do
-            generator = stub 'generator', :depthfirst? => true
-            resource = stub 'resource'
+            generator = stub 'generator', :depthfirst? => true, :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)
@@ -36,8 +36,8 @@ describe Puppet::Transaction do
         end
 
         it "should skip generated resources that conflict with existing resources" do
-            generator = mock 'generator'
-            resource = stub 'resource'
+            generator = mock 'generator', :tags => []
+            resource = stub 'resource', :tag => nil
 
             @catalog = Puppet::Resource::Catalog.new
             @transaction = Puppet::Transaction.new(@catalog)

-- 
Puppet packaging for Debian