[#4114] Fix failures in the unit tests

The initial commit changed the name of a method (close -> close_all) and
changed the way the array log destination worked before we saw that the
unit tests were using it differently.

1 files changed, 3 insertions, 4 deletions

diff --git a/test/util/log.rb b/test/util/log.rb
index 00db10e61..b28d601e9 100755
--- a/test/util/log.rb
+++ b/test/util/log.rb
@@ -12,14 +12,13 @@ class TestLog < Test::Unit::TestCase
     def setup
         super
         @oldloglevel = Puppet::Util::Log.level
-        Puppet::Util::Log.close
+        Puppet::Util::Log.close_all
     end
 
     def teardown
         super
-        Puppet::Util::Log.close
+        Puppet::Util::Log.close_all
         Puppet::Util::Log.level = @oldloglevel
-        Puppet::Util::Log.newdestination(:console)
     end
 
     def getlevels
@@ -57,7 +56,7 @@ class TestLog < Test::Unit::TestCase
         }
         msgs = mkmsgs(levels)
         assert(msgs.length == levels.length)
-        Puppet::Util::Log.close
+        Puppet::Util::Log.close_all
         count = 0
 
         assert(FileTest.exists?(logfile), "Did not create logfile")