[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 61fd460cb0e9db08e21b2e9ce24b24bc2e96b0be
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Dec 17 17:21:45 2009 -0800

    Fix #2924 Test Failed: Puppet::Indirector::FileContent::FileServer when finding files should find plugin file content in the environment specified in the request
    
    The change in #2590 (ea584787) clears the environment list that this
    spec relies on. Reordered the spec so that doesn't happen anymore.
    
    Signed-off-by: Jesse Wolfe <jes5199 at gmail.com>

diff --git a/spec/integration/indirector/file_content/file_server.rb b/spec/integration/indirector/file_content/file_server.rb
index ea89230..e8f777e 100755
--- a/spec/integration/indirector/file_content/file_server.rb
+++ b/spec/integration/indirector/file_content/file_server.rb
@@ -29,9 +29,10 @@ describe Puppet::Indirector::FileContent::FileServer, " when finding files" do
         file = File.join(modpath, "lib", "file.rb")
         File.open(file, "w") { |f| f.puts "1" }
 
+        Puppet.settings[:modulepath] = "/no/such/file"
+
         env = Puppet::Node::Environment.new("foo")
         env.stubs(:modulepath).returns [path]
-        Puppet.settings[:modulepath] = "/no/such/file"
 
         result = Puppet::FileServing::Content.search("plugins", :environment => "foo", :recurse => true)
 

-- 
Puppet packaging for Debian