diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-01-05 17:22:30 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-01-06 15:19:42 -0800 |
| commit | b16e10dba6606b808ef195f4b57f2e8c66cf65ab (patch) | |
| tree | bdacf054c1e877166217336322050ee03f28d607 /test | |
| parent | fb8509acbd947712cac094a49227d28a16a366aa (diff) | |
| parent | 19eb1e78e115d10bfb822e510213e4fab9cd2599 (diff) | |
Merge branch '2.6.x' into next
Conflicts:
Rakefile
lib/puppet/resource/type_collection.rb
lib/puppet/simple_graph.rb
lib/puppet/transaction.rb
lib/puppet/transaction/report.rb
lib/puppet/util/metric.rb
spec/integration/indirector/report/rest_spec.rb
spec/spec_specs/runnable_spec.rb
spec/unit/configurer_spec.rb
spec/unit/indirector_spec.rb
spec/unit/transaction/change_spec.rb
Diffstat (limited to 'test')
| -rw-r--r-- | test/lib/puppettest/fileparsing.rb | 2 | ||||
| -rw-r--r-- | test/lib/puppettest/reporttesting.rb | 2 | ||||
| -rwxr-xr-x | test/other/report.rb | 2 |
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 |