diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:30:51 -0800 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2010-12-16 11:30:51 -0800 |
| commit | 480c399f183627f5f588e9dc9f5f86f683c0e468 (patch) | |
| tree | cb67d36e37e252edceef1cd848cc32d679f5d20e /test/lib | |
| parent | 73397a24db7e715c7712def75612dc4a5071ca7f (diff) | |
| parent | 52ca8c78c270b93ce997217900a3d333ad8154cc (diff) | |
| download | puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.tar.gz puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.tar.xz puppet-480c399f183627f5f588e9dc9f5f86f683c0e468.zip | |
Merge branch '2.6.x' into next
Manually Resolved Conflicts:
lib/puppet/resource/type_collection.rb
spec/unit/configurer_spec.rb
spec/unit/indirector/catalog/active_record_spec.rb
spec/unit/resource/type_collection_spec.rb
spec/unit/transaction/resource_harness_spec.rb
Diffstat (limited to 'test/lib')
| -rw-r--r-- | test/lib/puppettest/support/utils.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb index e022f123c..bca5d9634 100644 --- a/test/lib/puppettest/support/utils.rb +++ b/test/lib/puppettest/support/utils.rb @@ -92,7 +92,7 @@ module PuppetTest::Support::Utils method = type trans.send(method) - newevents = trans.events.reject { |e| e.status == 'failure' }.collect { |e| + newevents = trans.events.reject { |e| ['failure', 'audit'].include? e.status }.collect { |e| e.name } |