From 0e336bf62b818aaa31fcc323ab5d31e5eb92eb46 Mon Sep 17 00:00:00 2001
From: Luke Kanies <luke@madstop.com>
Date: Fri, 5 Oct 2007 00:07:38 -0500
Subject: This commit is focused on getting the 'puppet' executable to work. 
 As a result, it involves a lot of integration-level testing, and a lot of
 small design changes to make the code actually work.

In particular, indirections can now have default termini,
so that configurations and facts default to their code terminus

Also, I've removed the ability to manually control whether
ast nodes are used.  I might need to add it back in later,
but if so it will be in the form of a global setting,
rather than the previous system of passing it through 10 different
classes.  Instead, the parser detects whether there are AST nodes
defined and requires them if so or ignores them if not.

About 75 tests are still failing in the main set of tests,
but it's going to be a long slog to get them working --
there are significant design issues around them, as most of
the failures are a result of tests trying to emulate both the
client and server sides of a connection, which normally would
have different fact termini but in this case must have the same
terminus just because they're in the same process and are global.

The next step, then, is to figure that process out, thus finding a way
to make this all work.
---
 spec/unit/parser/compile.rb     | 10 ++++++++++
 spec/unit/parser/interpreter.rb | 23 ++---------------------
 2 files changed, 12 insertions(+), 21 deletions(-)

(limited to 'spec/unit/parser')

diff --git a/spec/unit/parser/compile.rb b/spec/unit/parser/compile.rb
index f6b3c9b3f..8bfcdd495 100755
--- a/spec/unit/parser/compile.rb
+++ b/spec/unit/parser/compile.rb
@@ -49,4 +49,14 @@ describe Puppet::Parser::Compile, " when compiling" do
         @compile.resources.find { |r| r.to_s == "Class[two]" }.should be_nil
         @compile.resources.find { |r| r.to_s == "Class[four]" }.should be_nil
     end
+
+    it "should enable ast_nodes if the parser has any nodes" do
+        @parser.expects(:nodes).returns(:one => :yay)
+        @compile.ast_nodes?.should be_true
+    end
+
+    it "should disable ast_nodes if the parser has no nodes" do
+        @parser.expects(:nodes).returns({})
+        @compile.ast_nodes?.should be_false
+    end
 end
diff --git a/spec/unit/parser/interpreter.rb b/spec/unit/parser/interpreter.rb
index b4aa2a2d1..fbf3bdb23 100755
--- a/spec/unit/parser/interpreter.rb
+++ b/spec/unit/parser/interpreter.rb
@@ -24,16 +24,6 @@ describe Puppet::Parser::Interpreter, " when initializing" do
         interp.code.should equal(:code)
         interp.file.should be_nil
     end
-
-    it "should default to usenodes" do
-        interp = Puppet::Parser::Interpreter.new
-        interp.usenodes?.should be_true
-    end
-
-    it "should allow disabling of usenodes" do
-        interp = Puppet::Parser::Interpreter.new :UseNodes => false
-        interp.usenodes?.should be_false
-    end
 end
 
 describe Puppet::Parser::Interpreter, " when creating parser instances" do
@@ -159,22 +149,13 @@ describe Puppet::Parser::Interpreter, " when compiling configurations" do
         @parser = mock 'parser'
     end
 
-    it "should create a compile with the node, parser, and whether to use ast nodes when ast nodes is true" do
+    it "should create a compile with the node and parser" do
         @compile.expects(:compile).returns(:config)
         @interp.expects(:parser).with(:myenv).returns(@parser)
-        @interp.expects(:usenodes?).returns(true)
-        Puppet::Parser::Compile.expects(:new).with(@node, @parser, :ast_nodes => true).returns(@compile)
+        Puppet::Parser::Compile.expects(:new).with(@node, @parser).returns(@compile)
         @interp.compile(@node)
     end
 
-    it "should create a compile with the node, parser, and whether to use ast nodes when ast nodes is false" do
-        @compile.expects(:compile).returns(:config)
-        @interp.expects(:parser).with(:myenv).returns(@parser)
-        @interp.expects(:usenodes?).returns(false)
-        Puppet::Parser::Compile.expects(:new).with(@node, @parser, :ast_nodes => false).returns(@compile)
-        @interp.compile(@node).should equal(:config)
-    end
-
     it "should fail intelligently when no parser can be found" do
         @interp.expects(:parser).with(:myenv).returns(nil)
         proc { @interp.compile(@node) }.should raise_error(Puppet::ParseError)
-- 
cgit