summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Kantrowitz <noah@coderanger.net>2017-04-10 18:26:28 -0700
committerNoah Kantrowitz <noah@coderanger.net>2017-04-10 18:26:28 -0700
commit5932782cabcdc434e431711027af1211d7e0d31c (patch)
tree5f51690a84f76ba1d615b5dc40b5b280ff5e4a98
parent42d2a515571e60607a6b9b195d409784105b7e80 (diff)
downloadchef-5932782cabcdc434e431711027af1211d7e0d31c.tar.gz
We missed this when options got converted to an array.
Use the actual resource code paths to make it less unit-y but more accurate for the future. Signed-off-by: Noah Kantrowitz <noah@coderanger.net>
-rw-r--r--lib/chef/provider/package/yum.rb2
-rw-r--r--spec/unit/provider/package/yum_spec.rb10
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/chef/provider/package/yum.rb b/lib/chef/provider/package/yum.rb
index f1ba9dd4eb..d87e421409 100644
--- a/lib/chef/provider/package/yum.rb
+++ b/lib/chef/provider/package/yum.rb
@@ -194,7 +194,7 @@ class Chef
def manage_extra_repo_control
if new_resource.options
repo_control = []
- new_resource.options.split.each do |opt|
+ new_resource.options.each do |opt|
repo_control << opt if opt =~ /--(enable|disable)repo=.+/
end
diff --git a/spec/unit/provider/package/yum_spec.rb b/spec/unit/provider/package/yum_spec.rb
index e0a5f8c862..a662ec9013 100644
--- a/spec/unit/provider/package/yum_spec.rb
+++ b/spec/unit/provider/package/yum_spec.rb
@@ -278,31 +278,31 @@ describe Chef::Provider::Package::Yum do
end
it "should flush the cache if :before is true" do
- allow(@new_resource).to receive(:flush_cache).and_return({ :after => false, :before => true })
+ @new_resource.flush_cache({ :after => false, :before => true })
expect(@yum_cache).to receive(:reload).once
@provider.load_current_resource
end
it "should flush the cache if :before is false" do
- allow(@new_resource).to receive(:flush_cache).and_return({ :after => false, :before => false })
+ @new_resource.flush_cache({ :after => false, :before => false })
expect(@yum_cache).not_to receive(:reload)
@provider.load_current_resource
end
it "should detect --enablerepo or --disablerepo when passed among options, collect them preserving order and notify the yum cache" do
- allow(@new_resource).to receive(:options).and_return("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c --enablerepo=bar")
+ @new_resource.options("--stuff --enablerepo=foo --otherthings --disablerepo=a,b,c --enablerepo=bar")
expect(@yum_cache).to receive(:enable_extra_repo_control).with("--enablerepo=foo --disablerepo=a,b,c --enablerepo=bar")
@provider.load_current_resource
end
it "should let the yum cache know extra repos are disabled if --enablerepo or --disablerepo aren't among options" do
- allow(@new_resource).to receive(:options).and_return("--stuff --otherthings")
+ @new_resource.options("--stuff --otherthings")
expect(@yum_cache).to receive(:disable_extra_repo_control)
@provider.load_current_resource
end
it "should let the yum cache know extra repos are disabled if options aren't set" do
- allow(@new_resource).to receive(:options).and_return(nil)
+ @new_resource.options(nil)
expect(@yum_cache).to receive(:disable_extra_repo_control)
@provider.load_current_resource
end