diff options
| author | David Crowder <david.crowder@cerner.com> | 2014-12-23 14:50:13 -0600 |
|---|---|---|
| committer | tyler-ball <tyleraball@gmail.com> | 2015-01-28 11:44:46 -0800 |
| commit | db12d259b7b12194c8d5fb5e82e3245d62253e9c (patch) | |
| tree | 54c7e433ee1e6e3b7a175c91f7822443b9f4a413 | |
| parent | 164a1b224edfdbbfb1698da2179cc4784f35d011 (diff) | |
| download | chef-db12d259b7b12194c8d5fb5e82e3245d62253e9c.tar.gz | |
fix error in tests where shell_out was being expected incorrectly
| -rw-r--r-- | lib/chef/provider/package/rpm.rb | 2 | ||||
| -rw-r--r-- | spec/unit/provider/package/rpm_spec.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/provider/package/rpm.rb b/lib/chef/provider/package/rpm.rb index 2ece8f7a7a..ca5417eb97 100644 --- a/lib/chef/provider/package/rpm.rb +++ b/lib/chef/provider/package/rpm.rb @@ -76,7 +76,7 @@ class Chef end Chef::Log.debug("#{@new_resource} checking install state") - @rpm_status = shell_out("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") + @rpm_status = shell_out!("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' #{@current_resource.package_name}") @rpm_status.stdout.each_line do |line| case line when /^([\w\d+_.-]+)\s([\w\d_.-]+)$/ diff --git a/spec/unit/provider/package/rpm_spec.rb b/spec/unit/provider/package/rpm_spec.rb index 3f529ac99b..5e3f3f9f1b 100644 --- a/spec/unit/provider/package/rpm_spec.rb +++ b/spec/unit/provider/package/rpm_spec.rb @@ -62,7 +62,7 @@ describe Chef::Provider::Package::Rpm do stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5" status = double("Status", :exitstatus => 0, :stdout => stdout) expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status) - expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status) + expect(provider).to receive(:shell_out!).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status) provider.load_current_resource expect(provider.current_resource.package_name).to eq("ImageMagick-c++") expect(provider.new_resource.version).to eq("6.5.4.7-7.el6_5") @@ -72,7 +72,7 @@ describe Chef::Provider::Package::Rpm do stdout = "ImageMagick-c++ 6.5.4.7-7.el6_5" status = double("Status", :exitstatus => 0, :stdout => stdout) expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' /tmp/ImageMagick-c++-6.5.4.7-7.el6_5.x86_64.rpm").and_return(status) - expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status) + expect(provider).to receive(:shell_out!).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' ImageMagick-c++").and_return(status) provider.load_current_resource expect(provider.current_resource.version).to eq("6.5.4.7-7.el6_5") end @@ -96,7 +96,7 @@ describe Chef::Provider::Package::Rpm do new_resource.source 'openssh-askpass' provider = Chef::Provider::Package::Rpm.new(new_resource, run_context) expect(provider).to receive(:shell_out!).with("rpm -qp --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status) - expect(provider).to receive(:shell_out).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status) + expect(provider).to receive(:shell_out!).with("rpm -q --queryformat '%{NAME} %{VERSION}-%{RELEASE}\n' openssh-askpass").and_return(status) provider.load_current_resource expect(provider.current_resource.version).to be_nil end |