[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 d343af0f2d115889543540bd3cc8bf66e9a9473e
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Dec 14 15:21:56 2009 -0800

    2876 spec/unit/indirector/catalog/compiler.rb changes behaviour
    
    1) Improve test so it doesn't fail if an autoload happens.
    2) Improve test so it doesn't show a warning.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/unit/indirector/catalog/compiler.rb b/spec/unit/indirector/catalog/compiler.rb
index 7f09422..84f5cdc 100755
--- a/spec/unit/indirector/catalog/compiler.rb
+++ b/spec/unit/indirector/catalog/compiler.rb
@@ -61,7 +61,7 @@ describe Puppet::Resource::Catalog::Compiler do
     describe "when finding catalogs" do
         before do
             Facter.stubs(:value).returns("whatever")
-            env = stub 'environment', :name => "yay"
+            env = stub 'environment', :name => "yay", :modulepath => []
             Puppet::Node::Environment.stubs(:new).returns(env)
 
             @compiler = Puppet::Resource::Catalog::Compiler.new
@@ -111,6 +111,7 @@ describe Puppet::Resource::Catalog::Compiler do
         end
 
         it "should extract and save any facts from the request" do
+            Puppet::Node.expects(:find).with(@name).returns @node
             @compiler.expects(:extract_facts_from_request).with(@request)
             @compiler.interpreter.stubs(:compile)
             @compiler.find(@request)

-- 
Puppet packaging for Debian