All language tests now pass. I expect there are other failures elsewhere, but I want to commit this before delving into them. My method for fixing the tests was to do as little as possible, keeping the tests as bad or as good as they were before I started. Mostly this was about changing references to the interpreter into references to the parser (since that is where the new* methods are now for ast containers) and then dealing with the new config object and its relationship to scopes.

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/puppet/parser/scope.rb b/lib/puppet/parser/scope.rb
index 808362858..527ed4dcd 100644
--- a/lib/puppet/parser/scope.rb
+++ b/lib/puppet/parser/scope.rb
@@ -21,7 +21,7 @@ class Puppet::Parser::Scope
 
     # Proxy accessors
     def host
-        @configuration.host
+        @configuration.node.name
     end
     def interpreter
         @configuration.interpreter
@@ -241,11 +241,11 @@ class Puppet::Parser::Scope
     # can support multiple unrelated classes with the same name.
     def setclass(klass)
         if klass.is_a?(AST::HostClass)
-            unless klass.classname
+            unless name = klass.classname
                 raise Puppet::DevError, "Got a %s with no fully qualified name" %
                     klass.class
             end
-            @configuration.class_set(klass.classname, self)
+            @configuration.class_set(name, self)
         else
             raise Puppet::DevError, "Invalid class %s" % klass.inspect
         end