Fixing #314 and #729; here's the changelog:

    Refactored how the parser and interpreter relate,
    so parsing is now effectively an atomic process (thus
    fixing #314 and #729).  This makes the interpreter less
    prone to error and less prone to show the error to the
    clients.  Note that this means that if a configuration
    fails to parse, then the previous, parseable configuration
    will be used instead, so the client will not know that
    the configuration failed to parse.



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

2 files changed, 2 insertions, 2 deletions

diff --git a/test/lib/puppettest/parsertesting.rb b/test/lib/puppettest/parsertesting.rb
index 0cd308181..d66367ada 100644
--- a/test/lib/puppettest/parsertesting.rb
+++ b/test/lib/puppettest/parsertesting.rb
@@ -46,7 +46,7 @@ module PuppetTest::ParserTesting
     end
 
     def mkparser
-        Puppet::Parser::Parser.new(mkinterp)
+        Puppet::Parser::Parser.new()
     end
 
     def mkscope(hash = {})
diff --git a/test/lib/puppettest/support/collection.rb b/test/lib/puppettest/support/collection.rb
index 69feb5077..305b805d5 100644
--- a/test/lib/puppettest/support/collection.rb
+++ b/test/lib/puppettest/support/collection.rb
@@ -18,7 +18,7 @@ module PuppetTest::Support::Collection
                 query = nil
 
                 assert_nothing_raised("Could not parse '#{str}'") do
-                    query = parser.parse(code)[0].query
+                    query = parser.parse(code).classes[""].code[0].query
                 end
 
                 yield str, res, query