summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian C. Dunn <jdunn@aquezada.com>2015-08-12 15:21:09 -0400
committerJulian C. Dunn <jdunn@aquezada.com>2015-08-12 15:21:09 -0400
commit47847507e1303ce50df54c51e636a1867e329940 (patch)
treebbc2b5753a3753f75931982be86c1fa8be780ac4
parent190aecd09e93f105521b9aaf066699fca3412999 (diff)
parent1cd881fed9af620e51dd9040d3d17b1938ae82ac (diff)
downloadchef-47847507e1303ce50df54c51e636a1867e329940.tar.gz
Merge pull request #3759 from juliandunn/service-group-3730
Don't use shell_out! on "lssrc -g"
-rw-r--r--lib/chef/provider/service/aix.rb2
-rw-r--r--spec/unit/provider/service/aix_service_spec.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/service/aix.rb b/lib/chef/provider/service/aix.rb
index 09ed4bbf01..0c95ce2c8e 100644
--- a/lib/chef/provider/service/aix.rb
+++ b/lib/chef/provider/service/aix.rb
@@ -116,7 +116,7 @@ class Chef
end
def is_resource_group?
- so = shell_out!("lssrc -g #{@new_resource.service_name}")
+ so = shell_out("lssrc -g #{@new_resource.service_name}")
if so.exitstatus == 0
Chef::Log.debug("#{@new_resource.service_name} is a group")
@is_resource_group = true
diff --git a/spec/unit/provider/service/aix_service_spec.rb b/spec/unit/provider/service/aix_service_spec.rb
index a0c8bb3407..5cca7d6f0a 100644
--- a/spec/unit/provider/service/aix_service_spec.rb
+++ b/spec/unit/provider/service/aix_service_spec.rb
@@ -94,7 +94,7 @@ describe Chef::Provider::Service::Aix do
end
it "service is a group" do
- expect(@provider).to receive(:shell_out!).with("lssrc -g chef").and_return(@status)
+ expect(@provider).to receive(:shell_out).with("lssrc -g chef").and_return(@status)
@provider.load_current_resource
expect(@provider.instance_eval("@is_resource_group")).to be_truthy
end
@@ -106,7 +106,7 @@ describe Chef::Provider::Service::Aix do
end
it "service is a group" do
- expect(@provider).to receive(:shell_out!).with("lssrc -g chef").and_return(@status)
+ expect(@provider).to receive(:shell_out).with("lssrc -g chef").and_return(@status)
@provider.load_current_resource
expect(@provider.instance_eval("@is_resource_group")).to be_truthy
end
@@ -119,7 +119,7 @@ describe Chef::Provider::Service::Aix do
end
it "service is a subsystem" do
- expect(@provider).to receive(:shell_out!).with("lssrc -g chef").and_return(@group_status)
+ expect(@provider).to receive(:shell_out).with("lssrc -g chef").and_return(@group_status)
expect(@provider).to receive(:shell_out!).with("lssrc -s chef").and_return(@service_status)
@provider.load_current_resource
expect(@provider.instance_eval("@is_resource_group")).to be_falsey