summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rwxr-xr-xtest/language/functions.rb8
-rwxr-xr-xtest/ral/providers/package/apt.rb12
2 files changed, 16 insertions, 4 deletions
diff --git a/test/language/functions.rb b/test/language/functions.rb
index 2d882382d..34207de17 100755
--- a/test/language/functions.rb
+++ b/test/language/functions.rb
@@ -398,17 +398,17 @@ class TestLangFunctions < Test::Unit::TestCase
interp = mkinterp
scope = mkscope(:interp => interp)
- fun = interp.newdefine("fun::test")
+ fun = interp.newdefine("yay::ness")
foo = interp.newdefine("foo::bar")
search = Puppet::Parser::Functions.function(:search)
assert_nothing_raised do
- scope.function_search(["foo", "fun"])
+ scope.function_search(["foo", "yay"])
end
ffun = ffoo = nil
- assert_nothing_raised do
- ffun = scope.finddefine("test")
+ assert_nothing_raised("Search path change did not work") do
+ ffun = scope.finddefine("ness")
ffoo = scope.finddefine('bar')
end
diff --git a/test/ral/providers/package/apt.rb b/test/ral/providers/package/apt.rb
index a56233c0b..a82f1bc3a 100755
--- a/test/ral/providers/package/apt.rb
+++ b/test/ral/providers/package/apt.rb
@@ -66,6 +66,12 @@ class AptPackageProviderTest < PuppetTest::TestCase
'--purge',
'faff'
).returns(0)
+ pkg.provider.expects(
+ :dpkg
+ ).with(
+ '--purge',
+ 'faff'
+ ).returns(0)
pkg.evaluate.each { |state| state.transaction = self; state.forward }
end
@@ -134,6 +140,12 @@ class AptPackageProviderTest < PuppetTest::TestCase
'--purge',
'faff'
).returns(0)
+ pkg.provider.expects(
+ :dpkg
+ ).with(
+ '--purge',
+ 'faff'
+ ).returns(0)
pkg.evaluate.each { |state| state.transaction = self; state.forward }
end