Committing both the finalization of the config code, plus all of the code necessary to get basic isomorphism from code to transportables and back. Mostly keyword and autoname stuff.

git-svn-id: https://reductivelabs.com/svn/puppet/trunk@871 980ebf18-57e1-0310-9a29-db15c13687c0

2 files changed, 7 insertions, 1 deletions

diff --git a/test/language/ast.rb b/test/language/ast.rb
index 3dc5fd582..b5497eb0d 100755
--- a/test/language/ast.rb
+++ b/test/language/ast.rb
@@ -172,6 +172,10 @@ class TestAST < Test::Unit::TestCase
         scope = nil
         assert_nothing_raised("Could not evaluate node") {
             scope = Puppet::Parser::Scope.new()
+            scope.name = "nodetest"
+            scope.type = "nodetest"
+            scope.keyword = "nodetest"
+            scope.top = true
             top.evaluate(scope)
         }
 
@@ -339,7 +343,7 @@ class TestAST < Test::Unit::TestCase
     end
 
     # Test that node inheritance works correctly
-    def test_znodeinheritance
+    def test_nodeinheritance
         children = []
 
         # create the base node
diff --git a/test/language/scope.rb b/test/language/scope.rb
index 67792daae..707372d1a 100755
--- a/test/language/scope.rb
+++ b/test/language/scope.rb
@@ -396,6 +396,8 @@ class TestScope < Test::Unit::TestCase
         scope = nil
         assert_nothing_raised("Could not evaluate") {
             scope = Puppet::Parser::Scope.new()
+            scope.name =  "topscope"
+            scope.type =  "topscope"
             objects = scope.evaluate(top)
         }