From ae19ad32028f77c14fae16869a63fc19d2d515d2 Mon Sep 17 00:00:00 2001 From: NimishaS Date: Fri, 18 Nov 2016 14:03:34 +0000 Subject: Using shell_out_with_timeout! to throw exception if the command fails. Hardcoded expand.exe path to avoid hitting gnu expand Signed-off-by: NimishaS --- spec/functional/resource/msu_package_spec.rb | 2 +- spec/unit/provider/package/msu_spec.rb | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'spec') diff --git a/spec/functional/resource/msu_package_spec.rb b/spec/functional/resource/msu_package_spec.rb index 128eb9dfac..23342be6ae 100644 --- a/spec/functional/resource/msu_package_spec.rb +++ b/spec/functional/resource/msu_package_spec.rb @@ -19,7 +19,7 @@ require "spec_helper" require "chef/provider/package/cab" -describe Chef::Resource::MsuPackage, :win2012r2_only, :appveyor_only do +describe Chef::Resource::MsuPackage, :win2012r2_only do let(:package_name) { "Package_for_KB2959977" } let(:package_source) { "https://download.microsoft.com/download/3/B/3/3B320C07-B7B1-41E5-81F4-79EBC02DF7D3/Windows8.1-KB2959977-x64.msu" } diff --git a/spec/unit/provider/package/msu_spec.rb b/spec/unit/provider/package/msu_spec.rb index d9b97aaee6..26cde5bd5f 100644 --- a/spec/unit/provider/package/msu_spec.rb +++ b/spec/unit/provider/package/msu_spec.rb @@ -243,8 +243,7 @@ The operation completed successfully. describe "#extract_msu_contents" do it "extracts the msu contents by using mixlib shellout" do - expect(Mixlib::ShellOut).to receive(:new).with("expand -f:* msu_file destination", { :timeout => new_resource.timeout }) - expect(provider).to receive(:with_os_architecture) + expect(provider).to receive(:shell_out_with_timeout!).with("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* msu_file destination") provider.extract_msu_contents("msu_file", "destination") end end -- cgit v1.2.1