From 1ebc91e1bd1a9bd13dccb23787e6a7da7bca0e99 Mon Sep 17 00:00:00 2001 From: Jesse Wolfe Date: Thu, 8 Apr 2010 14:10:00 -0700 Subject: Use a helper function to evaluate a resource since the API has changed --- test/lib/puppettest/support/assertions.rb | 1 + test/ral/providers/package/aptitude.rb | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/test/lib/puppettest/support/assertions.rb b/test/lib/puppettest/support/assertions.rb index ec0712d15..b4dd1338b 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 6e94f0ab8..113085c75 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 -- cgit