Fixing a couple of bugs in preparation for 0.15.2; mostly they were in the testing system and resulted from changing :File to :Manifest in server/master

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

2 files changed, 6 insertions, 3 deletions

diff --git a/test/client/client.rb b/test/client/client.rb
index c96feb943..41d55dab2 100644
--- a/test/client/client.rb
+++ b/test/client/client.rb
@@ -149,9 +149,9 @@ class TestClient < Test::Unit::TestCase
         master = client = nil
         assert_nothing_raised() {
             master = Puppet::Server::Master.new(
-                :File => manifest,
+                :Manifest => manifest,
                 :UseNodes => false,
-                :Local => true
+                :Local => false
             )
         }
         assert_nothing_raised() {
@@ -160,6 +160,9 @@ class TestClient < Test::Unit::TestCase
             )
         }
 
+        # Fake that it's local, so it creates the class file
+        client.local = false
+
         assert_nothing_raised {
             client.getconfig
         }
diff --git a/test/client/master.rb b/test/client/master.rb
index 7ec440cc6..11d49ac85 100644
--- a/test/client/master.rb
+++ b/test/client/master.rb
@@ -21,7 +21,7 @@ class TestMasterClient < Test::Unit::TestCase
         assert_nothing_raised() {
             # this is the default server setup
             master = Puppet::Server::Master.new(
-                :File => file,
+                :Manifest => file,
                 :UseNodes => false,
                 :Local => true
             )