Merge branch 'ticket/next/6928' into next

1 files changed, 0 insertions, 6 deletions

diff --git a/spec/unit/parser/type_loader_spec.rb b/spec/unit/parser/type_loader_spec.rb
index 9367b61c8..48a3f29d3 100755
--- a/spec/unit/parser/type_loader_spec.rb
+++ b/spec/unit/parser/type_loader_spec.rb
@@ -44,12 +44,6 @@ describe Puppet::Parser::TypeLoader do
       Puppet::Parser::Parser.any_instance.stubs(:file=)
     end
 
-    it "should return immediately when imports are being ignored" do
-      Puppet::Parser::Files.expects(:find_manifests).never
-      Puppet[:ignoreimport] = true
-      @loader.import("foo").should be_nil
-    end
-
     it "should find all manifests matching the file or pattern" do
       Puppet::Parser::Files.expects(:find_manifests).with { |pat, opts| pat == "myfile" }.returns ["modname", %w{one}]
       @loader.import("myfile")