[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 2.6.1rc1-141-gcdb2b90

[Markus Roberts]

The following commit has been merged in the upstream branch:
commit 067a46db27a746a680f8afbb32bb5317ce7a7056
Author: Markus Roberts <Markus at reality.com>
Date:   Sat Jul 24 21:55:42 2010 -0700

    Temporary tweak to tests for #4242
    
    The tests introduced with the fix for #4242 have isolation issues apparently
    due to the creation of a stage resource which is global and persistent.  This
    patch stubs the creation, marks the one test which is thus invalidated pending,
    and adds comments noting the problem.

diff --git a/spec/unit/parser/functions/include_spec.rb b/spec/unit/parser/functions/include_spec.rb
index 4954ac6..e5f0519 100644
--- a/spec/unit/parser/functions/include_spec.rb
+++ b/spec/unit/parser/functions/include_spec.rb
@@ -8,6 +8,10 @@ describe "the 'include' function" do
     Puppet::Node::Environment.stubs(:current).returns(nil)
     @compiler = Puppet::Parser::Compiler.new(Puppet::Node.new("foo"))
     @scope = Puppet::Parser::Scope.new(:compiler => @compiler)
+    # MQR TODO: Without the following stub these tests cause hundreds of spurious errors in
+    #           subsequent tests.  With it, there are no spurious failures and all but one
+    #           of the tests (marked pending, bellow) fail.  This needs a better solution.
+    Puppet::Parser::Resource.stubs(:new).with('stage', :main, :scope => @scope).returns 'foo'
   end
 
   it "should exist" do
@@ -32,6 +36,7 @@ describe "the 'include' function" do
   end
 
   it "should allow a parent to include its child" do
+    pending "Resolution of MQR TODO item, above"
     @parent_type = Puppet::Resource::Type.new(:hostclass, "parent")
     @parent_resource = Puppet::Parser::Resource.new(:hostclass, "parent", :scope => @scope)
     @subscope = @parent_type.subscope(@scope, at parent_resource)

-- 
Puppet packaging for Debian