summaryrefslogtreecommitdiffstats
path: root/spec
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2009-12-14 18:39:08 -0800
committerJames Turnbull <james@lovedthanlost.net>2009-12-15 23:26:31 +1100
commit118adc1654396a4fd765d7b662f5993cc3bc5e84 (patch)
treec191a4281fe2c337c7f3826c4d27de16bfd6e910 /spec
parent0f63a54b710e3a3390240404565515e362ce78d1 (diff)
downloadpuppet-118adc1654396a4fd765d7b662f5993cc3bc5e84.tar.gz
puppet-118adc1654396a4fd765d7b662f5993cc3bc5e84.tar.xz
puppet-118adc1654396a4fd765d7b662f5993cc3bc5e84.zip
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.
Diffstat (limited to 'spec')
-rw-r--r--spec/shared_behaviours/file_serving.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/shared_behaviours/file_serving.rb b/spec/shared_behaviours/file_serving.rb
index 8aad8885a..876889475 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")