summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Wolfe <jes5199@gmail.com>2010-04-08 18:22:38 -0700
committertest branch <puppet-dev@googlegroups.com>2010-02-17 06:50:53 -0800
commitce944a5d9ae7b18a2557eb282ac20e4ff49ce6f3 (patch)
tree6c90eeeb6451369a6460896c9e3a1a764ed8fc6f
parent481ddb845c5ae88965088cc908877bffa3311b1f (diff)
downloadpuppet-ce944a5d9ae7b18a2557eb282ac20e4ff49ce6f3.tar.gz
puppet-ce944a5d9ae7b18a2557eb282ac20e4ff49ce6f3.tar.xz
puppet-ce944a5d9ae7b18a2557eb282ac20e4ff49ce6f3.zip
Fix unit tests in file/target.rb
-rw-r--r--test/lib/puppettest/support/utils.rb2
-rwxr-xr-xtest/ral/type/file/target.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index 405a0c54b..4d9dd2129 100644
--- a/test/lib/puppettest/support/utils.rb
+++ b/test/lib/puppettest/support/utils.rb
@@ -80,7 +80,7 @@ module PuppetTest::Support::Utils
method = type
trans.send(method)
- newevents = trans.events.reject { |e| e.nil? }.collect { |e|
+ newevents = trans.events.reject { |e| e.status == 'failure' }.collect { |e|
e.name
}
diff --git a/test/ral/type/file/target.rb b/test/ral/type/file/target.rb
index ab73974d6..f2a7de6f4 100755
--- a/test/ral/type/file/target.rb
+++ b/test/ral/type/file/target.rb
@@ -70,7 +70,7 @@ class TestFileTarget < Test::Unit::TestCase
# Use classes for comparison, because the resource inspection is so large
assert_equal(NilClass, catalog.resource(:file, sublink).class, "dynamically generated resources were not removed")
- assert_equal([], link.evaluate, "Link is not in sync")
+ assert_events([], link, "Link is not in sync")
end
def test_recursivelinking