chef 14.2.0 → 14.3.37

data/spec/unit/provider/package/msu_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Nimisha Sharad (<nimisha.sharad@msystechnologies.com>)
-# Copyright:: Copyright 2008-2016, Chef Software, Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -31,66 +31,66 @@ describe Chef::Provider::Package::Msu, :windows_only do
   end
 
   let(:installed_package_list_stdout) do
-    <<-EOF
-Packages listing:
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+    <<~EOF
+      Packages listing:
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
     EOF
   end
 
   let(:package_version_stdout) do
-    <<-EOF
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    <<~EOF
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
   end
 
   let(:get_package_info_stdout) do
-    <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
-
-Image Version: 6.1.7600.16385
-
-Package information:
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-Applicable : Yes
-Copyright : Microsoft Corporation
-Company : Microsoft Corporation
-State : Installed
-Dependency : Language Pack
-The operation completed successfully
+    <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
+
+      Image Version: 6.1.7600.16385
+
+      Package information:
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      Applicable : Yes
+      Copyright : Microsoft Corporation
+      Company : Microsoft Corporation
+      State : Installed
+      Dependency : Language Pack
+      The operation completed successfully
     EOF
   end
 
   def allow_get_packages
-    get_packages_stdout = <<-EOF
-Deployment Image Servicing and Management tool
-Version: 6.1.7600.16385
+    get_packages_stdout = <<~EOF
+      Deployment Image Servicing and Management tool
+      Version: 6.1.7600.16385
 
-Image Version: 6.1.7600.16385
+      Image Version: 6.1.7600.16385
 
-Packages listing:
+      Packages listing:
 
-Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
+      Package Identity : Package_for_KB2999486~31bf3856ad364e35~amd64~~6.1.9768.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
 
-Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
-State : Installed
-Release Type : Language Pack
-Install Time : 2/11/2015 11:33 PM
+      Package Identity : Package_for_KB2994825~31bf3856ad364e35~amd64~~6.1.7601.0
+      State : Installed
+      Release Type : Language Pack
+      Install Time : 2/11/2015 11:33 PM
 
-Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
-State : Installed
-Release Type : Feature Pack
-Install Time : 11/21/2010 3:40 AM
+      Package Identity : Package_for_KB2664825~31bf3856ad364e35~amd64~~6.1.3.0
+      State : Installed
+      Release Type : Feature Pack
+      Install Time : 11/21/2010 3:40 AM
 
-The operation completed successfully.
+      The operation completed successfully.
     EOF
     get_packages_obj = double(stdout: get_packages_stdout)
     allow_any_instance_of(Chef::Provider::Package::Cab).to receive(:dism_command).with("/Get-Packages").and_return(get_packages_obj)
@@ -243,7 +243,7 @@ The operation completed successfully.
 
   describe "#extract_msu_contents" do
     it "extracts the msu contents by using mixlib shellout" do
-      expect(provider).to receive(:shell_out_with_timeout!).with("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* msu_file destination")
+      expect(provider).to receive(:shell_out!).with("#{ENV['SYSTEMROOT']}\\system32\\expand.exe -f:* msu_file destination")
       provider.extract_msu_contents("msu_file", "destination")
     end
   end

data/spec/unit/provider/package/openbsd_spec.rb

@@ -45,19 +45,19 @@ describe Chef::Provider::Package::Openbsd do
 
     context "when not already installed" do
       before do
-        allow(provider).to receive(:shell_out!).with("pkg_info", "-e", "#{name}->0", anything()).and_return(instance_double("shellout", :stdout => ""))
+        allow(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{name}->0", anything()).and_return(instance_double("shellout", stdout: ""))
       end
 
       context "when there is a single candidate" do
 
         context "when source is not provided" do
           it "should run the installation command" do
-            expect(provider).to receive(:shell_out!).with("pkg_info", "-I", name, anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}\n"))
-            expect(provider).to receive(:shell_out!).with(
+            expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
+              instance_double("shellout", stdout: "#{name}-#{version}\n"))
+            expect(provider).to receive(:shell_out_compacted!).with(
               "pkg_add", "-r", "#{name}-#{version}",
-              { :env => { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-            ) { OpenStruct.new :status => true }
+              { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
+            ) { OpenStruct.new status: true }
             provider.run_action(:install)
           end
         end
@@ -69,8 +69,8 @@ describe Chef::Provider::Package::Openbsd do
 
         context "if no version is specified" do
           it "should raise an exception" do
-            expect(provider).to receive(:shell_out!).with("pkg_info", "-I", name, anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor_a}\n#{name}-#{version}-#{flavor_b}\n"))
+            expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
+              instance_double("shellout", stdout: "#{name}-#{version}-#{flavor_a}\n#{name}-#{version}-#{flavor_b}\n"))
             expect { provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package, /multiple matching candidates/)
           end
         end
@@ -83,13 +83,13 @@ describe Chef::Provider::Package::Openbsd do
 
           context "if no version is specified" do
             it "should run the installation command" do
-              expect(provider).to receive(:shell_out!).with("pkg_info", "-e", "#{package_name}->0", anything()).and_return(instance_double("shellout", :stdout => ""))
-              expect(provider).to receive(:shell_out!).with("pkg_info", "-I", name, anything()).and_return(
-                instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor}\n"))
-              expect(provider).to receive(:shell_out!).with(
+              expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-e", "#{package_name}->0", anything()).and_return(instance_double("shellout", stdout: ""))
+              expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", name, anything()).and_return(
+                instance_double("shellout", stdout: "#{name}-#{version}-#{flavor}\n"))
+              expect(provider).to receive(:shell_out_compacted!).with(
                 "pkg_add", "-r", "#{name}-#{version}-#{flavor}",
                 { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-              ) { OpenStruct.new :status => true }
+              ) { OpenStruct.new status: true }
               provider.run_action(:install)
             end
           end
@@ -98,14 +98,14 @@ describe Chef::Provider::Package::Openbsd do
 
         context "if a version is specified" do
           it "should use the flavor from the version" do
-            expect(provider).to receive(:shell_out!).with("pkg_info", "-I", "#{name}-#{version}-#{flavor_b}", anything()).and_return(
-              instance_double("shellout", :stdout => "#{name}-#{version}-#{flavor_a}\n"))
+            expect(provider).to receive(:shell_out_compacted!).with("pkg_info", "-I", "#{name}-#{version}-#{flavor_b}", anything()).and_return(
+              instance_double("shellout", stdout: "#{name}-#{version}-#{flavor_a}\n"))
 
             new_resource.version("#{version}-#{flavor_b}")
-            expect(provider).to receive(:shell_out!).with(
+            expect(provider).to receive(:shell_out_compacted!).with(
               "pkg_add", "-r", "#{name}-#{version}-#{flavor_b}",
               { env: { "PKG_PATH" => "http://ftp.OpenBSD.org/pub/OpenBSD/5.5/packages/amd64/" }, timeout: 900 }
-            ) { OpenStruct.new :status => true }
+            ) { OpenStruct.new status: true }
             provider.run_action(:install)
           end
         end
@@ -122,9 +122,9 @@ describe Chef::Provider::Package::Openbsd do
       @provider.current_resource = @current_resource
     end
     it "should run the command to delete the installed package" do
-      expect(@provider).to receive(:shell_out!).with(
+      expect(@provider).to receive(:shell_out_compacted!).with(
         "pkg_delete", @name, env: nil, timeout: 900
-      ) { OpenStruct.new :status => true }
+      ) { OpenStruct.new status: true }
       @provider.remove_package(@name, nil)
     end
   end

data/spec/unit/provider/package/pacman_spec.rb

@@ -26,14 +26,14 @@ describe Chef::Provider::Package::Pacman do
     @new_resource = Chef::Resource::Package.new("nano")
     @current_resource = Chef::Resource::Package.new("nano")
 
-    @status = double(:stdout => "", :exitstatus => 0)
+    @status = double(stdout: "", exitstatus: 0)
     @provider = Chef::Provider::Package::Pacman.new(@new_resource, @run_context)
     allow(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
 
-    allow(@provider).to receive(:shell_out).and_return(@status)
+    allow(@provider).to receive(:shell_out_compacted).and_return(@status)
     @stdin = StringIO.new
-    @stdout = StringIO.new(<<-ERR)
-error: package "nano" not found
+    @stdout = StringIO.new(<<~ERR)
+      error: package "nano" not found
 ERR
     @stderr = StringIO.new
     @pid = 2342
@@ -51,79 +51,79 @@ ERR
     end
 
     it "should run pacman query with the package name" do
-      expect(@provider).to receive(:shell_out).with("pacman", "-Qi", @new_resource.package_name, { timeout: 900 }).and_return(@status)
+      expect(@provider).to receive(:shell_out_compacted).with("pacman", "-Qi", @new_resource.package_name, { timeout: 900 }).and_return(@status)
       @provider.load_current_resource
     end
 
     it "should read stdout on pacman" do
-      allow(@provider).to receive(:shell_out).and_return(@status)
+      allow(@provider).to receive(:shell_out_compacted).and_return(@status)
       @provider.load_current_resource
     end
 
     it "should set the installed version to nil on the current resource if pacman installed version not exists" do
-      allow(@provider).to receive(:shell_out).and_return(@status)
+      allow(@provider).to receive(:shell_out_compacted).and_return(@status)
       @provider.load_current_resource
     end
 
     it "should set the installed version if pacman has one" do
-      stdout = <<-PACMAN
-Name           : nano
-Version        : 2.2.2-1
-URL            : http://www.nano-editor.org
-Licenses       : GPL
-Groups         : base
-Provides       : None
-Depends On     : glibc  ncurses
-Optional Deps  : None
-Required By    : None
-Conflicts With : None
-Replaces       : None
-Installed Size : 1496.00 K
-Packager       : Andreas Radke <andyrtr@archlinux.org>
-Architecture   : i686
-Build Date     : Mon 18 Jan 2010 06:16:16 PM CET
-Install Date   : Mon 01 Feb 2010 10:06:30 PM CET
-Install Reason : Explicitly installed
-Install Script : Yes
-Description    : Pico editor clone with enhancements
+      stdout = <<~PACMAN
+        Name           : nano
+        Version        : 2.2.2-1
+        URL            : http://www.nano-editor.org
+        Licenses       : GPL
+        Groups         : base
+        Provides       : None
+        Depends On     : glibc  ncurses
+        Optional Deps  : None
+        Required By    : None
+        Conflicts With : None
+        Replaces       : None
+        Installed Size : 1496.00 K
+        Packager       : Andreas Radke <andyrtr@archlinux.org>
+        Architecture   : i686
+        Build Date     : Mon 18 Jan 2010 06:16:16 PM CET
+        Install Date   : Mon 01 Feb 2010 10:06:30 PM CET
+        Install Reason : Explicitly installed
+        Install Script : Yes
+        Description    : Pico editor clone with enhancements
 PACMAN
 
-      status = double(:stdout => stdout, :exitstatus => 0)
-      allow(@provider).to receive(:shell_out).and_return(status)
+      status = double(stdout: stdout, exitstatus: 0)
+      allow(@provider).to receive(:shell_out_compacted).and_return(status)
       @provider.load_current_resource
       expect(@current_resource.version).to eq("2.2.2-1")
     end
 
     it "should set the candidate version if pacman has one" do
-      status = double(:stdout => "core nano 2.2.3-1", :exitstatus => 0)
-      allow(@provider).to receive(:shell_out).and_return(status)
+      status = double(stdout: "core nano 2.2.3-1", exitstatus: 0)
+      allow(@provider).to receive(:shell_out_compacted).and_return(status)
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("2.2.3-1")
     end
 
     it "should use pacman.conf to determine valid repo names for package versions" do
-      @pacman_conf = <<-PACMAN_CONF
-[options]
-HoldPkg      = pacman glibc
-Architecture = auto
+      @pacman_conf = <<~PACMAN_CONF
+        [options]
+        HoldPkg      = pacman glibc
+        Architecture = auto
 
-[customrepo]
-Server = https://my.custom.repo
+        [customrepo]
+        Server = https://my.custom.repo
 
-[core]
-Include = /etc/pacman.d/mirrorlist
+        [core]
+        Include = /etc/pacman.d/mirrorlist
 
-[extra]
-Include = /etc/pacman.d/mirrorlist
+        [extra]
+        Include = /etc/pacman.d/mirrorlist
 
-[community]
-Include = /etc/pacman.d/mirrorlist
+        [community]
+        Include = /etc/pacman.d/mirrorlist
 PACMAN_CONF
 
-      status = double(:stdout => "customrepo nano 1.2.3-4", :exitstatus => 0)
+      status = double(stdout: "customrepo nano 1.2.3-4", exitstatus: 0)
       allow(::File).to receive(:exist?).with("/etc/pacman.conf").and_return(true)
       allow(::File).to receive(:read).with("/etc/pacman.conf").and_return(@pacman_conf)
-      allow(@provider).to receive(:shell_out).and_return(status)
+      allow(@provider).to receive(:shell_out_compacted).and_return(status)
 
       @provider.load_current_resource
       expect(@provider.candidate_version).to eql("1.2.3-4")
@@ -140,7 +140,7 @@ PACMAN_CONF
     end
 
     it "should raise an exception if pacman does not return a candidate version" do
-      allow(@provider).to receive(:shell_out).and_return(@status)
+      allow(@provider).to receive(:shell_out_compacted).and_return(@status)
       expect { @provider.candidate_version }.to raise_error(Chef::Exceptions::Package)
     end
 
@@ -151,12 +151,12 @@ PACMAN_CONF
 
   describe Chef::Provider::Package::Pacman, "install_package" do
     it "should run pacman install with the package name and version" do
-      expect(@provider).to receive(:shell_out!).with("pacman", "--sync", "--noconfirm", "--noprogressbar", "nano", { timeout: 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("pacman", "--sync", "--noconfirm", "--noprogressbar", "nano", { timeout: 900 })
       @provider.install_package("nano", "1.0")
     end
 
     it "should run pacman install with the package name and version and options if specified" do
-      expect(@provider).to receive(:shell_out!).with("pacman", "--sync", "--noconfirm", "--noprogressbar", "--debug", "nano", { timeout: 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("pacman", "--sync", "--noconfirm", "--noprogressbar", "--debug", "nano", { timeout: 900 })
       @new_resource.options("--debug")
 
       @provider.install_package("nano", "1.0")
@@ -172,12 +172,12 @@ PACMAN_CONF
 
   describe Chef::Provider::Package::Pacman, "remove_package" do
     it "should run pacman remove with the package name" do
-      expect(@provider).to receive(:shell_out!).with("pacman", "--remove", "--noconfirm", "--noprogressbar", "nano", { timeout: 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("pacman", "--remove", "--noconfirm", "--noprogressbar", "nano", { timeout: 900 })
       @provider.remove_package("nano", "1.0")
     end
 
     it "should run pacman remove with the package name and options if specified" do
-      expect(@provider).to receive(:shell_out!).with("pacman", "--remove", "--noconfirm", "--noprogressbar", "--debug", "nano", { timeout: 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("pacman", "--remove", "--noconfirm", "--noprogressbar", "--debug", "nano", { timeout: 900 })
       @new_resource.options("--debug")
 
       @provider.remove_package("nano", "1.0")

data/spec/unit/provider/package/paludis_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Vasiliy Tolstov <v.tolstov@selfip.ru>
-# Copyright:: Copyright 2014-2016, Chef Software Inc.
+# Copyright:: Copyright 2014-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -33,84 +33,84 @@ describe Chef::Provider::Package::Paludis do
 
     @stdin = StringIO.new
     @stderr = StringIO.new
-    @stdout = <<-PKG_STATUS
-group/ntp 0 accounts
-group/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r2 arbor
-user/ntp 0 accounts
-user/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r1 installed
+    @stdout = <<~PKG_STATUS
+      group/ntp 0 accounts
+      group/ntp 0 installed-accounts
+      net/ntp 4.2.6_p5-r2 arbor
+      user/ntp 0 accounts
+      user/ntp 0 installed-accounts
+      net/ntp 4.2.6_p5-r1 installed
 PKG_STATUS
     @pid = 12345
-    @shell_out = OpenStruct.new(:stdout => @stdout, :stdin => @stdin, :stderr => @stderr, :status => @status, :exitstatus => 0)
+    @shell_out = OpenStruct.new(stdout: @stdout, stdin: @stdin, stderr: @stderr, status: @status, exitstatus: 0)
   end
 
   context "when loading current resource" do
     it "should create a current resource with the name of the new_resource" do
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       expect(Chef::Resource::Package).to receive(:new).and_return(@current_resource)
       @provider.load_current_resource
     end
 
     it "should set the current resources package name to the new resources package name" do
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       expect(@current_resource).to receive(:package_name).with(@new_resource.package_name)
       @provider.load_current_resource
     end
 
     it "should run pkg info with the package name" do
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "print-ids", "-M", "none", "-m", @new_resource.package_name, "-f", "%c/%p %v %r\n").and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "print-ids", "-M", "none", "-m", @new_resource.package_name, "-f", "%c/%p %v %r\n", timeout: 900).and_return(@shell_out)
       @provider.load_current_resource
     end
 
     it "should return new version if package is installed" do
-      @stdout.replace(<<-INSTALLED)
-group/ntp 0 accounts
-group/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r2 arbor
-user/ntp 0 accounts
-user/ntp 0 installed-accounts
-net/ntp 4.2.6_p5-r1 installed
+      @stdout.replace(<<~INSTALLED)
+        group/ntp 0 accounts
+        group/ntp 0 installed-accounts
+        net/ntp 4.2.6_p5-r2 arbor
+        user/ntp 0 accounts
+        user/ntp 0 installed-accounts
+        net/ntp 4.2.6_p5-r1 installed
 INSTALLED
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       @provider.load_current_resource
       expect(@current_resource.version).to eq("4.2.6_p5-r1")
       expect(@provider.candidate_version).to eql("4.2.6_p5-r2")
     end
 
     it "should return the current resource" do
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       expect(@provider.load_current_resource).to eql(@current_resource)
     end
   end
 
   context "when installing a package" do
     it "should run pkg install with the package name and version" do
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
 
     it "should run pkg install with the package name and version and options if specified" do
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "resolve", "-x", "--preserve-world", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "--preserve-world", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @new_resource.options "--preserve-world"
       @provider.install_package("net/ntp", "4.2.6_p5-r2")
     end
 
     it "should not contain invalid characters for the version string" do
-      @stdout.replace(<<-PKG_STATUS)
-sys-process/lsof 4.87 arbor
-sys-process/lsof 4.87 x86_64
+      @stdout.replace(<<~PKG_STATUS)
+        sys-process/lsof 4.87 arbor
+        sys-process/lsof 4.87 x86_64
 PKG_STATUS
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "resolve", "-x", "=sys-process/lsof-4.87", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=sys-process/lsof-4.87", { timeout: @new_resource.timeout || 900 })
       @provider.install_package("sys-process/lsof", "4.87")
     end
 
     it "should not include the human-readable version in the candidate_version" do
-      @stdout.replace(<<-PKG_STATUS)
-sys-process/lsof 4.87 arbor
-sys-process/lsof 4.87 x86_64
+      @stdout.replace(<<~PKG_STATUS)
+        sys-process/lsof 4.87 arbor
+        sys-process/lsof 4.87 x86_64
 PKG_STATUS
-      expect(@provider).to receive(:shell_out!).and_return(@shell_out)
+      expect(@provider).to receive(:shell_out_compacted!).and_return(@shell_out)
       @provider.load_current_resource
       expect(@current_resource.version).to be_nil
       expect(@provider.candidate_version).to eql("4.87")
@@ -119,14 +119,14 @@ PKG_STATUS
 
   context "when upgrading a package" do
     it "should run pkg install with the package name and version" do
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { :timeout => @new_resource.timeout || 900 })
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "resolve", "-x", "=net/ntp-4.2.6_p5-r2", { timeout: @new_resource.timeout || 900 })
       @provider.upgrade_package("net/ntp", "4.2.6_p5-r2")
     end
   end
 
   context "when uninstalling a package" do
     it "should run pkg uninstall with the package name and version" do
-      expect(@provider).to receive(:shell_out!).with("cave", "-L", "warning", "uninstall", "-x", "=net/ntp-4.2.6_p5-r2")
+      expect(@provider).to receive(:shell_out_compacted!).with("cave", "-L", "warning", "uninstall", "-x", "=net/ntp-4.2.6_p5-r2", timeout: 900)
       @provider.remove_package("net/ntp", "4.2.6_p5-r2")
     end