summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Lewis <nick@puppetlabs.com>2010-12-29 17:33:37 -0800
committerNick Lewis <nick@puppetlabs.com>2010-12-29 17:33:37 -0800
commit0b78decacf508f7586d3d4ee90277b980d4879a2 (patch)
treebc238123958e155b0a6508d25f05757fddcf82aa
parent4664460e0a4a935dab814a3218fc054c13e3cab6 (diff)
parent8631709d71833e68fbfe40dbee10fe876eb309ea (diff)
downloadpuppet-0b78decacf508f7586d3d4ee90277b980d4879a2.tar.gz
puppet-0b78decacf508f7586d3d4ee90277b980d4879a2.tar.xz
puppet-0b78decacf508f7586d3d4ee90277b980d4879a2.zip
Merge branch 'ticket/2.6.next/5723' into 2.6.next
-rwxr-xr-xspec/unit/type/package_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/unit/type/package_spec.rb b/spec/unit/type/package_spec.rb
index b0c5d2252..662fe4798 100755
--- a/spec/unit/type/package_spec.rb
+++ b/spec/unit/type/package_spec.rb
@@ -121,7 +121,7 @@ describe Puppet::Type.type(:package) do
before { @package[:ensure] = :purged }
it "should do nothing if it is :purged" do
- @provider.expects(:properties).returns(:ensure => :purged)
+ @provider.expects(:properties).returns(:ensure => :purged).at_least_once
@catalog.apply
end
@@ -141,7 +141,7 @@ describe Puppet::Type.type(:package) do
[:purged, :absent].each do |state|
it "should do nothing if it is #{state.to_s}" do
- @provider.expects(:properties).returns(:ensure => state)
+ @provider.expects(:properties).returns(:ensure => state).at_least_once
@catalog.apply
end
end
@@ -162,7 +162,7 @@ describe Puppet::Type.type(:package) do
[:present, :latest, "1.0"].each do |state|
it "should do nothing if it is #{state.to_s}" do
- @provider.expects(:properties).returns(:ensure => state)
+ @provider.expects(:properties).returns(:ensure => state).at_least_once
@catalog.apply
end
end