diff options
| -rw-r--r-- | lib/puppet/type/pfile.rb | 1 | ||||
| -rwxr-xr-x | test/types/tc_symlink.rb | 23 |
2 files changed, 1 insertions, 23 deletions
diff --git a/lib/puppet/type/pfile.rb b/lib/puppet/type/pfile.rb index 507cacf6a..8594681f4 100644 --- a/lib/puppet/type/pfile.rb +++ b/lib/puppet/type/pfile.rb @@ -1217,7 +1217,6 @@ module Puppet #Puppet.warning "Listing path %s" % path.inspect desc = server.list(path, r, ignore) - puts desc desc.split("\n").each { |line| file, type = line.split("\t") next if file == "/" diff --git a/test/types/tc_symlink.rb b/test/types/tc_symlink.rb index 43ee8e073..c9a334b70 100755 --- a/test/types/tc_symlink.rb +++ b/test/types/tc_symlink.rb @@ -10,29 +10,8 @@ require 'test/unit' # $Id$ -class TestSymlink < Test::Unit::TestCase +class TestSymlink < TestPuppet include FileTesting - # hmmm - # this is complicated, because we store references to the created - # objects in a central store - def setup - @symlink = nil - @@tmpfiles = [] - Puppet[:loglevel] = :debug if __FILE__ == $0 - end - - def teardown - @@tmpfiles.each { |file| - if FileTest.exists?(file) - Kernel.system("rm -rf %s" % file) - end - if FileTest.symlink?(file) - Kernel.system("rm -rf %s" % file) - end - } - Puppet::Type.allclear - end - def mktmpfile # because luke's home directory is on nfs, it can't be used for testing # as root |