diff options
| author | Paul Berry <paul@puppetlabs.com> | 2010-11-18 14:58:03 -0800 |
|---|---|---|
| committer | Paul Berry <paul@puppetlabs.com> | 2010-11-18 14:58:03 -0800 |
| commit | 2f1e05b04b3f1129b6c0ae415c5b0c2c5e62b330 (patch) | |
| tree | 0b1f407b0cc5d4a71a082cd0a85ed02dc672c19d /test/lib | |
| parent | 2a7863a87f685a7bff254cce7e557e9eb143ba7d (diff) | |
| parent | e8254856a5c9fa532886148cbe2b0f8d87179f01 (diff) | |
Merge branch 'maint/next/log_refactoring' into next
Diffstat (limited to 'test/lib')
| -rwxr-xr-x | test/lib/puppettest.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/puppettest.rb b/test/lib/puppettest.rb index 0b3a89a72..a60092cf7 100755 --- a/test/lib/puppettest.rb +++ b/test/lib/puppettest.rb @@ -185,7 +185,7 @@ module PuppetTest #if rake? or ! Puppet[:debug] #if defined?($puppet_debug) or ! rake? Puppet[:color] = false if textmate? - Puppet::Util::Log.newdestination(@logs) + Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs)) if defined? $console Puppet.info @method_name Puppet::Util::Log.newdestination(:console) @@ -305,7 +305,7 @@ module PuppetTest def logstore @logs = [] - Puppet::Util::Log.newdestination(@logs) + Puppet::Util::Log.newdestination(Puppet::Test::LogCollector.new(@logs)) end end |