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

[Jesse Wolfe]

The following commit has been merged in the upstream branch:
commit 94651df232b0bc0fed066ac005cccc9d5db0c152
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Fri Apr 9 14:22:36 2010 -0700

    Add stub to Puppet::Parser::Collector test to prevent runaway stub
    failures

diff --git a/spec/unit/parser/collector.rb b/spec/unit/parser/collector.rb
index 42da3ff..de5fc80 100755
--- a/spec/unit/parser/collector.rb
+++ b/spec/unit/parser/collector.rb
@@ -272,6 +272,10 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
         @equery = "test = true"
         @vquery = proc { |r| true }
 
+        res = stub("resource 1")
+        res.stubs(:type).returns @resource_type
+        Puppet::Resource.stubs(:new).returns res
+
         Puppet.settings.stubs(:value).with(:storeconfigs).returns true
         Puppet.settings.stubs(:value).with(:environment).returns "production"
 
@@ -360,7 +364,7 @@ describe Puppet::Parser::Collector, "when collecting exported resources" do
         one = stub 'one', :restype => "Mytype", :title => "one", :virtual? => true, :exported? => true, :ref => "one"
         Puppet::Rails::Resource.stubs(:find).returns([one])
 
-        resource = mock 'resource'
+        resource = mock 'resource', :type => "Mytype"
         one.expects(:to_resource).with(@scope).returns(resource)
         resource.stubs(:exported=)
         resource.stubs(:virtual=)

-- 
Puppet packaging for Debian