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

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

1 files changed, 1 insertions, 4 deletions

diff --git a/spec/unit/node/catalog.rb b/spec/unit/node/catalog.rb
index 434242103..d607b3540 100755
--- a/spec/unit/node/catalog.rb
+++ b/spec/unit/node/catalog.rb
@@ -514,10 +514,6 @@ describe Puppet::Node::Catalog, " when functioning as a resource container" do
             raise "Aliased non-isomorphic resource"
         end
     end
-
-    after do
-        Puppet::Type.allclear
-    end
 end
 
 describe Puppet::Node::Catalog do
@@ -647,6 +643,7 @@ describe Puppet::Node::Catalog, " when creating a relationship graph" do
         @file = Puppet::Type.type(:file)
         @one = @file.create :path => "/one"
         @two = @file.create :path => "/two"
+        @sub = @file.create :path => "/two/subdir"
         @catalog.add_edge @compone, @one
         @catalog.add_edge @comptwo, @two