[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. 0.25.5-639-g8f94f35

test branch puppet-dev at googlegroups.com
Wed Jul 14 10:31:27 UTC 2010


The following commit has been merged in the upstream branch:
commit ce944a5d9ae7b18a2557eb282ac20e4ff49ce6f3
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Apr 8 18:22:38 2010 -0700

    Fix unit tests in file/target.rb

diff --git a/test/lib/puppettest/support/utils.rb b/test/lib/puppettest/support/utils.rb
index 405a0c5..4d9dd21 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 ab73974..f2a7de6 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

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list