Fixing a parser test -- really, just removing tests

that belong with the AST classes rather than in the parser.

Yeah, these tests need to be rewritten.

Committed on an airplane. :)

3 files changed, 5 insertions, 18 deletions

diff --git a/lib/puppet/parser/ast/astarray.rb b/lib/puppet/parser/ast/astarray.rb
index 9a2dc286c..5f1e838d0 100644
--- a/lib/puppet/parser/ast/astarray.rb
+++ b/lib/puppet/parser/ast/astarray.rb
@@ -49,6 +49,7 @@ class Puppet::Parser::AST
                     end
                 end
             }
+
             rets = [settors, others].flatten.collect { |child|
                 child.safeevaluate(:scope => scope)
             }
diff --git a/lib/puppet/parser/ast/hostclass.rb b/lib/puppet/parser/ast/hostclass.rb
index 9c039bb49..d4904bebf 100644
--- a/lib/puppet/parser/ast/hostclass.rb
+++ b/lib/puppet/parser/ast/hostclass.rb
@@ -26,7 +26,7 @@ class Puppet::Parser::AST
             # Verify that we haven't already been evaluated.  This is
             # what provides the singleton aspect.
             if existing_scope = scope.compile.class_scope(self)
-                Puppet.debug "%s class already evaluated" % @type
+                Puppet.debug "Class '%s' already evaluated; not evaluating again" % (classname == "" ? "main" : classname)
                 return nil
             end
 
diff --git a/test/language/parser.rb b/test/language/parser.rb
index bc89eff20..9a2aed711 100755
--- a/test/language/parser.rb
+++ b/test/language/parser.rb
@@ -6,9 +6,12 @@ require 'mocha'
 require 'puppet'
 require 'puppet/parser/parser'
 require 'puppettest'
+require 'puppettest/support/utils'
 
 class TestParser < Test::Unit::TestCase
+    include PuppetTest
     include PuppetTest::ParserTesting
+    include PuppetTest::Support::Utils
     def setup
         super
         Puppet[:parseonly] = true
@@ -489,23 +492,6 @@ file { "/tmp/yayness":
                 assert_instance_of(AST::Resource, res)
                 check.call(res, "multiresource")
             end
-
-            # Now evaluate these
-            scope = mkscope
-
-            klass = parser.newclass ""
-            scope.source = klass
-
-            assert_nothing_raised do
-                ret.classes[""].evaluate :scope => scope, :resource => Puppet::Parser::Resource.new(:type => "mydefine", :title => 'whatever', :scope => scope, :source => scope.source)
-            end
-
-            # Make sure we can find both of them
-            %w{/tmp/1 /tmp/2}.each do |title|
-                res = scope.findresource("File[#{title}]")
-                assert(res, "Could not find %s" % title)
-                check.call(res, "found multiresource")
-            end
         end
     end