Fixing tests that were failing as a result of the merge,

including removing some now-obsolete code and tests from
the Settings class.

2 files changed, 1 insertions, 5 deletions

diff --git a/lib/puppet/node/catalog.rb b/lib/puppet/node/catalog.rb
index 77e845368..c5e32a032 100644
--- a/lib/puppet/node/catalog.rb
+++ b/lib/puppet/node/catalog.rb
@@ -61,7 +61,7 @@ class Puppet::Node::Catalog < Puppet::PGraph
     def add_resource(*resources)
         resources.each do |resource|
             unless resource.respond_to?(:ref)
-                raise ArgumentError, "Can only add objects that respond to :ref"
+                raise ArgumentError, "Can only add objects that respond to :ref, not instances of %s" % resource.class
             end
 
             fail_unless_unique(resource)
diff --git a/lib/puppet/util/settings.rb b/lib/puppet/util/settings.rb
index 089389a09..24a71516a 100644
--- a/lib/puppet/util/settings.rb
+++ b/lib/puppet/util/settings.rb
@@ -65,7 +65,6 @@ class Puppet::Util::Settings
             config = trans.to_catalog
             config.store_state = false
             config.apply
-            config.clear
         rescue => detail
             if Puppet[:trace]
                 puts detail.backtrace
@@ -589,8 +588,6 @@ Generated on #{Time.now}.
                         raise "Could not configure for running; got %s failure(s)" % failures
                     end
                 end
-            ensure
-                catalog.clear
             end
 
             sections.each { |s| @used << s }
@@ -1075,7 +1072,6 @@ Generated on #{Time.now}.
 
             return nil unless path.is_a?(String)
             return nil if path =~ /^\/dev/
-            return nil if Puppet::Type.type(:file)[path] # skip files that are in our global resource list.
 
             objects = []