Merge branch 'intermediate_merge_branch' into next

3 files changed, 4 insertions, 2 deletions

diff --git a/test/lib/puppettest/fileparsing.rb b/test/lib/puppettest/fileparsing.rb
index 914c4bcb3..bd4f9e152 100644
--- a/test/lib/puppettest/fileparsing.rb
+++ b/test/lib/puppettest/fileparsing.rb
@@ -1,3 +1,5 @@
+require 'test/unit'
+
 module PuppetTest::FileParsing
   # Run an isomorphism test on our parsing process.
   def fakedataparse(*files)
diff --git a/test/lib/puppettest/reporttesting.rb b/test/lib/puppettest/reporttesting.rb
index 448a6a9d8..54a2f6799 100644
--- a/test/lib/puppettest/reporttesting.rb
+++ b/test/lib/puppettest/reporttesting.rb
@@ -1,7 +1,7 @@
 module PuppetTest::Reporttesting
   def fakereport
     # Create a bunch of log messages in an array.
-    report = Puppet::Transaction::Report.new
+    report = Puppet::Transaction::Report.new("apply")
 
     3.times { |i|
       # We have to use warning so that the logs always happen
diff --git a/test/other/report.rb b/test/other/report.rb
index ce7d31e3b..fb206470a 100755
--- a/test/other/report.rb
+++ b/test/other/report.rb
@@ -68,7 +68,7 @@ class TestReports < Test::Unit::TestCase
 
   def test_store_report
     # Create a bunch of log messages in an array.
-    report = Puppet::Transaction::Report.new
+    report = Puppet::Transaction::Report.new("apply")
 
     # We have to reuse reporting here because of something going on in the
     # server/report.rb file