[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:23 UTC 2010


The following commit has been merged in the upstream branch:
commit 1ebc91e1bd1a9bd13dccb23787e6a7da7bca0e99
Author: Jesse Wolfe <jes5199 at gmail.com>
Date:   Thu Apr 8 14:10:00 2010 -0700

    Use a helper function to evaluate a resource since the API has changed

diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb
index ec0712d..b4dd133 100644
--- a/test/lib/puppettest/support/assertions.rb
+++ b/test/lib/puppettest/support/assertions.rb
@@ -2,6 +2,7 @@ require 'puppettest'
 require 'puppettest/support/utils'
 require 'fileutils'
 
+
 module PuppetTest
     include PuppetTest::Support::Utils
     def assert_logged(level, regex, msg = nil)
diff --git a/test/ral/providers/package/aptitude.rb b/test/ral/providers/package/aptitude.rb
index 6e94f0a..113085c 100755
--- a/test/ral/providers/package/aptitude.rb
+++ b/test/ral/providers/package/aptitude.rb
@@ -5,6 +5,8 @@ require File.dirname(__FILE__) + '/../../../lib/puppettest'
 require 'mocha'
 
 class AptitudePackageProviderTest < PuppetTest::TestCase
+    include PuppetTest
+
     confine "Aptitude package provider missing" =>
         Puppet::Type.type(:package).provider(:aptitude).suitable?
 
@@ -40,9 +42,7 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
                          'faff'
                       ).returns(0)
 
-        pkg.evaluate.each { |state|
-                    state.forward
-          }
+        assert_apply( pkg )
     end
 
     def test_purge
@@ -66,6 +66,6 @@ class AptitudePackageProviderTest < PuppetTest::TestCase
                             'faff'
                       ).returns(0)
 
-        pkg.evaluate.each { |state| state.forward }
+        assert_apply( pkg )
     end
 end

-- 
Puppet packaging for Debian



More information about the Pkg-puppet-devel mailing list