summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2008-02-23 13:58:58 -0500
committerLuke Kanies <luke@madstop.com>2008-02-23 13:58:58 -0500
commit9b6e5013e387998936979d7a372acde3af65cf61 (patch)
tree0e46ae836f2028e300deb8a3e3ade5add9cb60a1
parent7976015389149defd7f135a859ab11b94e6aad11 (diff)
downloadpuppet-9b6e5013e387998936979d7a372acde3af65cf61.tar.gz
puppet-9b6e5013e387998936979d7a372acde3af65cf61.tar.xz
puppet-9b6e5013e387998936979d7a372acde3af65cf61.zip
Fixing a test that was failing when a user-specific
fileserver.conf actually exists.
-rwxr-xr-xspec/integration/file_serving/configuration.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/file_serving/configuration.rb b/spec/integration/file_serving/configuration.rb
index b6505f096..6975594a8 100755
--- a/spec/integration/file_serving/configuration.rb
+++ b/spec/integration/file_serving/configuration.rb
@@ -12,8 +12,6 @@ describe Puppet::FileServing::Configuration, " when finding files with Puppet::F
# Just in case it already exists.
Puppet::FileServing::Configuration.clear_cache
- @config = Puppet::FileServing::Configuration.create
-
@mount = Puppet::FileServing::Mount.new("mymount")
FileTest.stubs(:exists?).with("/my/path").returns(true)
FileTest.stubs(:readable?).with("/my/path").returns(true)
@@ -25,6 +23,8 @@ describe Puppet::FileServing::Configuration, " when finding files with Puppet::F
@parser.stubs(:parse).returns("mymount" => @mount)
@parser.stubs(:changed?).returns(true)
Puppet::FileServing::Configuration::Parser.stubs(:new).returns(@parser)
+
+ @config = Puppet::FileServing::Configuration.create
end
it "should return nil if the file does not exist" do