Merging in refactoring from version 774 into version 784

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@785 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 10 insertions, 4 deletions

diff --git a/test/server/fileserver.rb b/test/server/fileserver.rb
index 98c0c4cb4..d1cdd696b 100755
--- a/test/server/fileserver.rb
+++ b/test/server/fileserver.rb
@@ -151,7 +151,7 @@ class TestFileServer < Test::Unit::TestCase
         }
 
         assert_nothing_raised {
-            file = Puppet::Type::PFile[tmpfile]
+            file = Puppet.type(:file)[tmpfile]
         }
 
         output = "/\tfile"
diff --git a/test/server/logger.rb b/test/server/logger.rb
index 6dc5dec48..dfaf50438 100644
--- a/test/server/logger.rb
+++ b/test/server/logger.rb
@@ -13,6 +13,12 @@ require 'cgi'
 class TestLogger < Test::Unit::TestCase
 	include ServerTest
 
+    def setup
+        super
+        #Puppet[:debug] = true
+        Puppet[:logdest] = :console
+    end
+
     # Test the log driver manually
     def test_localaddlog
         logger = nil
@@ -23,7 +29,7 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a message"
             )
         }
@@ -43,7 +49,7 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a remote message"
             )
         }
@@ -66,7 +72,7 @@ class TestLogger < Test::Unit::TestCase
         msg = nil
         assert_nothing_raised {
             msg = Puppet::Log.create(
-                :level => :info,
+                :level => :warning,
                 :message => "This is a logclient message"
             )
         }