diff options
| author | Jesse Wolfe <jes5199@gmail.com> | 2009-12-17 17:21:45 -0800 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-12-18 15:01:46 +1100 |
| commit | 61fd460cb0e9db08e21b2e9ce24b24bc2e96b0be (patch) | |
| tree | 8483179219617abd67c80aa4b7008cf15852011d | |
| parent | 2432b235d46c056bcb35b64b9197585fd13ab22a (diff) | |
| download | puppet-61fd460cb0e9db08e21b2e9ce24b24bc2e96b0be.tar.gz puppet-61fd460cb0e9db08e21b2e9ce24b24bc2e96b0be.tar.xz puppet-61fd460cb0e9db08e21b2e9ce24b24bc2e96b0be.zip | |
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@gmail.com>
| -rwxr-xr-x | spec/integration/indirector/file_content/file_server.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/integration/indirector/file_content/file_server.rb b/spec/integration/indirector/file_content/file_server.rb index ea892302e..e8f777ef8 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) |