[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 118adc1654396a4fd765d7b662f5993cc3bc5e84
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Mon Dec 14 18:39:08 2009 -0800

    2875 spurious test failure in spec/integration/file_serving/content.rb
    
    Any test calling it_should_behave_like "Puppet::FileServing::Files"
    potentially was affected by this bug, as its stubbing was not sufficient
    if anything needs to be autoloaded.

diff --git a/spec/shared_behaviours/file_serving.rb b/spec/shared_behaviours/file_serving.rb
index 8aad888..8768894 100644
--- a/spec/shared_behaviours/file_serving.rb
+++ b/spec/shared_behaviours/file_serving.rb
@@ -26,7 +26,7 @@ describe "Puppet::FileServing::Files", :shared => true do
 
     it "should use the file_server terminus when the 'puppet' URI scheme is used, no host name is present, and the process name is 'puppet'" do
         uri = "puppet:///fakemod/my/file"
-        Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil))
+        Puppet::Node::Environment.stubs(:new).returns(stub("env", :name => "testing", :module => nil, :modulepath => []))
         Puppet.settings.stubs(:value).returns ""
         Puppet.settings.stubs(:value).with(:name).returns("puppet")
         Puppet.settings.stubs(:value).with(:fileserverconfig).returns("/whatever")

-- 
Puppet packaging for Debian