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. :)

2 files changed, 2 insertions, 1 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