summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Kanies <luke@madstop.com>2007-08-22 21:39:21 -0500
committerLuke Kanies <luke@madstop.com>2007-08-22 21:39:21 -0500
commitb599862fc85c968676799edde865a96faa66a75b (patch)
treed6236652a2780c0cd42552b29f369b961eaeb008
parentfb3bfa57d892bd3398fb1434ca9914bb8a7c3b50 (diff)
downloadpuppet-b599862fc85c968676799edde865a96faa66a75b.tar.gz
puppet-b599862fc85c968676799edde865a96faa66a75b.tar.xz
puppet-b599862fc85c968676799edde865a96faa66a75b.zip
Fixing the integration test between interpreter and configuration -- the interpreter was not passing on that the config should use ast nodes
-rw-r--r--lib/puppet/parser/interpreter.rb2
-rwxr-xr-xtest/language/interpreter.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/interpreter.rb b/lib/puppet/parser/interpreter.rb
index e37ef5efe..fa90838f0 100644
--- a/lib/puppet/parser/interpreter.rb
+++ b/lib/puppet/parser/interpreter.rb
@@ -63,7 +63,7 @@ class Puppet::Parser::Interpreter
def compile(node)
parsefiles()
- return Puppet::Parser::Configuration.new(node, @parser).compile
+ return Puppet::Parser::Configuration.new(node, @parser, :ast_nodes => @usenodes).compile
end
private
diff --git a/test/language/interpreter.rb b/test/language/interpreter.rb
index ebbc3f87f..1adcb7bde 100755
--- a/test/language/interpreter.rb
+++ b/test/language/interpreter.rb
@@ -119,7 +119,7 @@ class TestInterpreter < PuppetTest::TestCase
node = mock('node')
config = mock('config')
config.expects(:compile).returns(:config)
- Puppet::Parser::Configuration.expects(:new).with(node, parser).returns(config)
+ Puppet::Parser::Configuration.expects(:new).with(node, parser, :ast_nodes => interp.usenodes).returns(config)
assert_equal(:config, interp.compile(node), "Did not return the results of config.compile")
end