summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Robinson <matt@puppetlabs.com>2011-03-22 16:42:06 -0700
committerMatt Robinson <matt@puppetlabs.com>2011-03-22 16:42:06 -0700
commitad85b67ade99a3ec4ed4a8e578c9d288706b567d (patch)
tree9a86b42f0f5647af852a692cd5e6f94e96e6c70a
parent8542160479538fe6575475c2dccf5d4696fa3e5d (diff)
parent61803976a835a039784cb199fe1e3957fd9cb64a (diff)
downloadpuppet-ad85b67ade99a3ec4ed4a8e578c9d288706b567d.tar.gz
puppet-ad85b67ade99a3ec4ed4a8e578c9d288706b567d.tar.xz
puppet-ad85b67ade99a3ec4ed4a8e578c9d288706b567d.zip
Merge branch 'feature/next/6527-pip_package_provider' into next
* feature/next/6527-pip_package_provider: (#6527) Fix pip tests
-rw-r--r--spec/unit/provider/package/pip_spec.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/spec/unit/provider/package/pip_spec.rb b/spec/unit/provider/package/pip_spec.rb
index 6809d3f90..8953b4b2c 100644
--- a/spec/unit/provider/package/pip_spec.rb
+++ b/spec/unit/provider/package/pip_spec.rb
@@ -161,14 +161,15 @@ describe provider_class do
end
it "should retry if pip has not yet been found" do
- @provider.stubs(:pip).raises(NoMethodError).returns("/fake/bin/pip")
+ @provider.expects(:pip).twice.with('freeze').raises(NoMethodError).then.returns(nil)
+ @provider.expects(:which).with('pip').returns("/fake/bin/pip")
@provider.method(:lazy_pip).call "freeze"
end
it "should fail if pip is missing" do
- @provider.stubs(:pip).twice.raises(NoMethodError)
- expect { @provider.method(:lazy_pip).call("freeze") }.to \
- raise_error(NoMethodError)
+ @provider.expects(:pip).with('freeze').raises(NoMethodError)
+ @provider.expects(:which).with('pip').returns(nil)
+ expect { @provider.method(:lazy_pip).call("freeze") }.to raise_error(NoMethodError)
end
end