summaryrefslogtreecommitdiffstats
path: root/test/network/handler
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-11-24 23:16:47 -0600
committerLuke Kanies <luke@madstop.com>2007-11-24 23:16:47 -0600
commitb575d1585322709604f558742dfd6f5ce412b342 (patch)
tree34e8049bf27383cb19ea23edf4d7d2a870eb7b48 /test/network/handler
parent3fb8e2e3097c0a9ef0c534a9c96fe02b43b5e38c (diff)
downloadpuppet-b575d1585322709604f558742dfd6f5ce412b342.tar.gz
puppet-b575d1585322709604f558742dfd6f5ce412b342.tar.xz
puppet-b575d1585322709604f558742dfd6f5ce412b342.zip
Integrating Matt Palmer's patch to provide a 'plugins'
mount, fixing #891. The patch was ported to the current code by David Schmitt, I applied the rest of Matt's patches, and I then fixed all of the code so that the tests passed. The primary change I had to make to the patch was reenabling host expansion in paths -- his patch had disabled it.
Diffstat (limited to 'test/network/handler')
-rwxr-xr-xtest/network/handler/fileserver.rb1
1 files changed, 0 insertions, 1 deletions
diff --git a/test/network/handler/fileserver.rb b/test/network/handler/fileserver.rb
index 3539169dc..962d35e65 100755
--- a/test/network/handler/fileserver.rb
+++ b/test/network/handler/fileserver.rb
@@ -1030,7 +1030,6 @@ allow *
end
conffile = tempfile
- @@tmpfiles << conffile
File.open(conffile, "w") { |f| f.puts "# a test config file" }