Renaming the 'Puppet::Util::Config' class to

'Puppet::Util::Settings'.  This is to clear up
confusion caused by the fact that we now have a
'Configuration' class to model host configurations,
or any set of resources as a "configuration".

4 files changed, 6 insertions, 6 deletions

diff --git a/test/network/client/ca.rb b/test/network/client/ca.rb
index 00ed7413a..511b6fcaa 100755
--- a/test/network/client/ca.rb
+++ b/test/network/client/ca.rb
@@ -23,7 +23,7 @@ class TestClientCA < Test::Unit::TestCase
         end
 
         [:hostprivkey, :hostcert, :localcacert].each do |name|
-            assert(FileTest.exists?(Puppet.config[name]),
+            assert(FileTest.exists?(Puppet.settings[name]),
                 "Did not create cert %s" % name)
         end
     end
diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index 93c63d637..382cd55cf 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.rb
@@ -113,9 +113,9 @@ class TestClient < Test::Unit::TestCase
         # Create a new ssl root.
         confdir = tempfile()
         Puppet[:ssldir] = confdir
-        Puppet.config.mkdir(:ssldir)
-        Puppet.config.clearused
-        Puppet.config.use(:ssl, :ca)
+        Puppet.settings.mkdir(:ssldir)
+        Puppet.settings.clearused
+        Puppet.settings.use(:ssl, :ca)
 
         mkserver
 
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 2e9ed2752..169a1de5f 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -680,7 +680,7 @@ end
         client.apply
 
         # Make sure the config is not cached.
-        config = Puppet.config[:localconfig] + ".yaml"
+        config = Puppet.settings[:localconfig] + ".yaml"
         assert(! File.exists?(config), "Cached an invalid configuration")
     end
 end
diff --git a/test/network/handler/master.rb b/test/network/handler/master.rb
index df946fa33..4f8e7fab2 100755
--- a/test/network/handler/master.rb
+++ b/test/network/handler/master.rb
@@ -75,7 +75,7 @@ class TestMaster < Test::Unit::TestCase
         assert(! client.fresh?(facts),
             "Client is incorrectly up to date")
 
-        Puppet.config.use(:main)
+        Puppet.settings.use(:main)
         config = nil
         assert_nothing_raised {
             config = client.getconfig