Feature #2935 Puppet[:mode] and Puppet[:name] are read-only

Historically, the Puppet[:name] setting has been settable, but the
results of chaning it are poorly defined.
The switch to modes instead of executable names seems like a good time
to disable this complexity.

Signed-off-by: Jesse Wolfe <jes5199@gmail.com>

3 files changed, 4 insertions, 4 deletions

diff --git a/test/network/authorization.rb b/test/network/authorization.rb
index 3ee10a4a8..9200c5824 100755
--- a/test/network/authorization.rb
+++ b/test/network/authorization.rb
@@ -82,8 +82,8 @@ class TestAuthConfig < Test::Unit::TestCase
         assert(! @obj.authorized?(@request), "Allowed call with no config file")
         assert_logged(:notice, /Denying/, "did not log call")
 
-        # Now set our name to the master, so calls are allowed
-        Puppet[:name] = "puppetmasterd"
+        # Now set our mode to master, so calls are allowed
+        Puppet.mode.stubs(:master?).returns true
         assert(@obj.authorized?(@request),
             "Denied call with no config file and master")
         assert_logged(:debug, /Allowing/, "did not log call")
diff --git a/test/network/handler/ca.rb b/test/network/handler/ca.rb
index 16782bb18..503d0188d 100755
--- a/test/network/handler/ca.rb
+++ b/test/network/handler/ca.rb
@@ -189,7 +189,7 @@ class TestCA < Test::Unit::TestCase
     # the puppetmasterd CA does not autostart.
     def test_caautosign
         server = nil
-        Puppet[:name] = "puppetmasterd"
+        Puppet.stubs(:master?).returns true
         assert_nothing_raised {
             server = Puppet::Network::HTTPServer::WEBrick.new(
                 :Port => @@port,
diff --git a/test/network/server/webrick.rb b/test/network/server/webrick.rb
index 5a930848d..5cde2b756 100755
--- a/test/network/server/webrick.rb
+++ b/test/network/server/webrick.rb
@@ -93,7 +93,7 @@ class TestWebrickServer < Test::Unit::TestCase
         }
 
         pid = fork {
-            Puppet[:name] = "puppetmasterd"
+            Puppet.mode.stubs(:master?).returns(true)
             assert_nothing_raised() {
                 trap(:INT) { server.shutdown }
                 server.start