Merge branch '0.24.x' of git://reductivelabs.com/puppet into 0.24.x

2 files changed, 17 insertions, 1 deletions

diff --git a/test/executables/puppetbin.rb b/test/executables/puppetbin.rb
index 218787c92..08329efb6 100755
--- a/test/executables/puppetbin.rb
+++ b/test/executables/puppetbin.rb
@@ -83,5 +83,22 @@ class TestPuppetBin < Test::Unit::TestCase
 
         assert(FileTest.exists?(path), "Failed to create config'ed file")
     end
+
+    def test_parseonly
+        path = tempfile()
+        manifest = tempfile()
+        puppet = %x{which puppet}.chomp
+        if puppet == ""
+            Puppet.info "cannot find puppet; cannot test parseonly"
+            return
+        end
+        code = 'File <<| |>>
+        include nosuchclass'
+
+        assert_nothing_raised {
+            IO.popen("#{puppet} --parseonly", 'w') { |p| p.puts code }
+        }
+        assert($? == 0, "parseonly test exited with code %s" % $?.to_i)
+    end
 end
 
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb
index 6c95985bf..64cb7aebe 100755
--- a/test/lib/puppettest.rb
+++ b/test/lib/puppettest.rb
@@ -315,7 +315,6 @@ module PuppetTest
         rescue Timeout::Error
             # just move on
         end
-        mocha_verify
     end
 
     def logstore