Renaming 'configuration' to 'catalog', fixing #954.

2 files changed, 6 insertions, 6 deletions

diff --git a/test/network/client/client.rb b/test/network/client/client.rb
index 918b9e86a..2588b9be5 100755
--- a/test/network/client/client.rb
+++ b/test/network/client/client.rb
@@ -46,13 +46,13 @@ class TestClient < Test::Unit::TestCase
         assert(File.exists?(certfile))
         assert(File.exists?(publickeyfile))
 
-        # verify we can retrieve the configuration
-        assert_nothing_raised("Client could not retrieve configuration") {
+        # verify we can retrieve the catalog
+        assert_nothing_raised("Client could not retrieve catalog") {
             client.getconfig
         }
 
         # and apply it
-        assert_nothing_raised("Client could not apply configuration") {
+        assert_nothing_raised("Client could not apply catalog") {
             client.apply
         }
 
diff --git a/test/network/client/master.rb b/test/network/client/master.rb
index 84cd9388c..60058aed9 100755
--- a/test/network/client/master.rb
+++ b/test/network/client/master.rb
@@ -558,12 +558,12 @@ end
 
         ftype = Puppet::Type.type(:file)
         file = ftype.create :title => "/what/ever", :ensure => :present
-        config = Puppet::Node::Configuration.new
+        config = Puppet::Node::Catalog.new
         config.add_resource(file)
 
         config.expects :apply
 
-        client.configuration = config
+        client.catalog = config
         client.expects(:getconfig)
         client.run
 
@@ -581,7 +581,7 @@ end
         end
     end
 
-    def test_invalid_configurations_do_not_get_cached
+    def test_invalid_catalogs_do_not_get_cached
         master = mkmaster :Code => "notify { one: require => File[yaytest] }"
         master.local = false # so it gets cached
         client = mkclient(master)