chef 16.18.30 → 17.10.163

data/spec/unit/provider/ifconfig/aix_spec.rb

@@ -68,8 +68,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should add an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "chdev -l #{@new_resource.device} -a netaddr=#{@new_resource.name}"
       expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
@@ -82,8 +82,8 @@ describe Chef::Provider::Ifconfig::Aix do
       @new_resource.device "en0"
       @new_resource.metric "1"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect { @provider.run_action(:add) }.to raise_error(Chef::Exceptions::Ifconfig, "interface metric property cannot be set for :add action")
@@ -94,8 +94,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should enable an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
       command = "ifconfig #{@new_resource.device} #{@new_resource.name}"
       expect(@provider).to receive(:shell_out_compacted!).with(*command.split(" "))
@@ -110,8 +110,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should not disable an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect(@provider).not_to receive(:shell_out_compacted!)
@@ -124,10 +124,10 @@ describe Chef::Provider::Ifconfig::Aix do
       before do
         @new_resource.device "en10"
         allow(@provider).to receive(:load_current_resource) do
-          @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
+          @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device
-          @provider.instance_variable_set("@current_resource", current_resource)
+          @provider.instance_variable_set(:@current_resource, current_resource)
         end
       end
 
@@ -147,8 +147,8 @@ describe Chef::Provider::Ifconfig::Aix do
     it "should not delete an interface if it does not exist" do
       @new_resource.device "en10"
       allow(@provider).to receive(:load_current_resource) do
-        @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
-        @provider.instance_variable_set("@current_resource", Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
+        @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
+        @provider.instance_variable_set(:@current_resource, Chef::Resource::Ifconfig.new("10.0.0.1", @run_context))
       end
 
       expect(@provider).not_to receive(:shell_out_compacted!)
@@ -161,10 +161,10 @@ describe Chef::Provider::Ifconfig::Aix do
       before do
         @new_resource.device "en10"
         allow(@provider).to receive(:load_current_resource) do
-          @provider.instance_variable_set("@status", double("Status", exitstatus: 0))
+          @provider.instance_variable_set(:@status, double("Status", exitstatus: 0))
           current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
           current_resource.device @new_resource.device
-          @provider.instance_variable_set("@current_resource", current_resource)
+          @provider.instance_variable_set(:@current_resource, current_resource)
         end
       end
 

data/spec/unit/provider/ifconfig/debian_spec.rb

@@ -42,7 +42,7 @@ describe Chef::Provider::Ifconfig::Debian do
   let(:provider) do
     status = double("Status", exitstatus: 0)
     provider = Chef::Provider::Ifconfig::Debian.new(new_resource, run_context)
-    provider.instance_variable_set("@status", status)
+    provider.instance_variable_set(:@status, status)
     provider.current_resource = current_resource
     allow(provider).to receive(:load_current_resource)
     allow(provider).to receive(:shell_out!)

data/spec/unit/provider/ifconfig/redhat_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Provider::Ifconfig::Redhat do
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
     status = double("Status", exitstatus: 0)
-    @provider.instance_variable_set("@status", status)
+    @provider.instance_variable_set(:@status, status)
     @provider.current_resource = @current_resource
 
     config_filename = "/etc/sysconfig/network-scripts/ifcfg-#{@new_resource.device}"

data/spec/unit/provider/ifconfig_spec.rb

@@ -35,7 +35,7 @@ describe Chef::Provider::Ifconfig do
     @current_resource = Chef::Resource::Ifconfig.new("10.0.0.1", @run_context)
 
     status = double("Status", exitstatus: 0)
-    @provider.instance_variable_set("@status", status)
+    @provider.instance_variable_set(:@status, status)
     @provider.current_resource = @current_resource
   end
 
@@ -58,9 +58,10 @@ describe Chef::Provider::Ifconfig do
         @provider.load_current_resource
       end
       it "should track state of ifconfig failure" do
-        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+        expect(@provider.instance_variable_get(:@status).exitstatus).not_to eq(0)
       end
       it "should thrown an exception when ifconfig fails" do
+        @provider.action = :add
         @provider.define_resource_requirements
         expect { @provider.process_resource_requirements }.to raise_error Chef::Exceptions::Ifconfig
       end
@@ -78,9 +79,10 @@ describe Chef::Provider::Ifconfig do
         @provider.load_current_resource
       end
       it "should track state of ifconfig failure" do
-        expect(@provider.instance_variable_get("@status").exitstatus).not_to eq(0)
+        expect(@provider.instance_variable_get(:@status).exitstatus).not_to eq(0)
       end
       it "should thrown an exception when ifconfig fails" do
+        @provider.action = :add
         @provider.define_resource_requirements
         expect { @provider.process_resource_requirements }.to raise_error Chef::Exceptions::Ifconfig
       end

data/spec/unit/provider/link_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Resource::Link do
   end
 
   def canonicalize(path)
-    ChefUtils.windows? ? path.tr("/", '\\') : path
+    ChefUtils.windows? ? path.tr("/", "\\") : path
   end
 
   describe "when the target is a symlink" do
@@ -125,7 +125,7 @@ describe Chef::Resource::Link do
 
   describe "when the target doesn't exist" do
     before do
-      allow(File).to receive(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
+      allow(File).to receive(:exist?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
       allow(provider.file_class).to receive(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
       provider.load_current_resource
     end
@@ -152,13 +152,16 @@ describe Chef::Resource::Link do
       allow(stat).to receive(:mode).and_return(0755)
       allow(provider.file_class).to receive(:stat).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(stat)
 
-      allow(File).to receive(:exists?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
+      # XXX: this might be broken?  it preserves prior behavior in the specs caused by File.exist?/exists? interactions
+      allow(Chef::ScanAccessControl).to receive(:new).and_return(instance_double(Chef::ScanAccessControl, set_all!: nil))
+
+      allow(File).to receive(:exist?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(true)
       allow(provider.file_class).to receive(:symlink?).with("#{CHEF_SPEC_DATA}/fofile-link").and_return(false)
     end
 
     describe "and the source does not exist" do
       before do
-        allow(File).to receive(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(false)
+        expect(File).to receive(:exist?).with("#{CHEF_SPEC_DATA}/fofile").and_return(false)
         provider.load_current_resource
       end
 
@@ -185,7 +188,7 @@ describe Chef::Resource::Link do
 
         allow(provider.file_class).to receive(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 
-        allow(File).to receive(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
+        allow(File).to receive(:exist?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
         provider.load_current_resource
       end
 
@@ -212,7 +215,7 @@ describe Chef::Resource::Link do
 
         allow(provider.file_class).to receive(:stat).with("#{CHEF_SPEC_DATA}/fofile").and_return(stat)
 
-        allow(File).to receive(:exists?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
+        allow(File).to receive(:exist?).with("#{CHEF_SPEC_DATA}/fofile").and_return(true)
         provider.load_current_resource
       end
 
@@ -262,6 +265,9 @@ describe Chef::Resource::Link do
         "#{CHEF_SPEC_DATA}/fofile-link"
       ).and_return(stat)
 
+      # XXX: this might be broken?  it preserves prior behavior in the specs caused by File.exist?/exists? interactions
+      allow(Chef::ScanAccessControl).to receive(:new).and_return(instance_double(Chef::ScanAccessControl, set_all!: nil))
+
       provider.load_current_resource
     end
 
@@ -336,10 +342,10 @@ describe Chef::Resource::Link do
           "#{CHEF_SPEC_DATA}/fofile-link"
         ).and_return(false)
 
-        allow(File).to receive(:exists?).with(
+        allow(File).to receive(:exist?).with(
           "#{CHEF_SPEC_DATA}/fofile-link"
         ).and_return(true)
-        allow(File).to receive(:exists?).with(
+        allow(File).to receive(:exist?).with(
           "#{CHEF_SPEC_DATA}/fofile"
         ).and_return(true)
 

data/spec/unit/provider/mount/aix_spec.rb

@@ -202,7 +202,7 @@ describe Chef::Provider::Mount::Aix do
     it "should enable mount if it is mounted and not enabled" do
       @new_resource.options("nodev,rw")
       stub_mounted_enabled(@provider, @mounted_output, "")
-      # Add existing mount to test enable action appends additional mount with seperating blank line
+      # Add existing mount to test enable action appends additional mount with separating blank line
       filesystems = StringIO.new
       filesystems.puts <<~ETCFILESYSTEMS
         /tmp/abc:

data/spec/unit/provider/mount/linux_spec.rb

@@ -10,9 +10,9 @@ describe Chef::Provider::Mount::Linux do
 
   let(:new_resource) do
     new_resource = Chef::Resource::Mount.new("/tmp/foo")
-    new_resource.device      "/dev/sdz1"
+    new_resource.device "/dev/sdz1"
     new_resource.device_type :device
-    new_resource.fstype      "ext3"
+    new_resource.fstype "ext3"
     new_resource.supports remount: false
     new_resource
   end
@@ -32,6 +32,7 @@ describe Chef::Provider::Mount::Linux do
   context "to see if the volume is mounted" do
 
     it "should set mounted true if the mount point is found in the mounts list" do
+      allow(provider).to receive(:shell_out!).with("losetup --list").and_return(double(stdout: "/tmp/foo"))
       allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo /dev/sdz1 type ext3 (rw)\n"))
       provider.load_current_resource
       expect(provider.current_resource.mounted).to be_truthy
@@ -104,4 +105,16 @@ describe Chef::Provider::Mount::Linux do
     end
   end
 
-end
+  context "to check if loop resource is mounted" do
+    it "should set mounted true in case of loop resource" do
+      new_resource.options "loop"
+      mount = "/tmp/foo /dev/loop16 iso660 cifs ro\n"
+      losetup = "/dev/loop16 0 0 1 1 /dev/sdz1 \n"
+      allow(provider).to receive(:shell_out!).with("findmnt -rn").and_return(double(stdout: mount))
+      allow(provider).to receive(:shell_out!).with("losetup -a").and_return(double(stdout: losetup))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_truthy
+    end
+  end
+
+end

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

@@ -48,6 +48,21 @@ describe Chef::Provider::Package::Apt do
     @timeout = 900
   end
 
+  def ubuntu1804downgrade_stubs
+    so = instance_double(Mixlib::ShellOut, stdout: "apt 1.6~beta1 (amd64)\notherstuff\n")
+    so2 = instance_double(Mixlib::ShellOut, error?: false)
+    allow(@provider).to receive(:shell_out).with("apt-get --version").and_return(so)
+    allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.6~beta1", "gt", "1.1.0").and_return(so2)
+  end
+
+  def ubuntu1404downgrade_stubs
+    so = instance_double(Mixlib::ShellOut, stdout: "apt 1.0.1ubuntu2 for amd64 compiled on Dec  8 2016 16:23:38\notherstuff\n")
+    so2 = instance_double(Mixlib::ShellOut, error?: true)
+    allow(@provider).to receive(:shell_out).with("apt-get --version").and_return(so)
+    allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "gt", "1.1.0").and_return(so2)
+    allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "eq", "1.1.0").and_return(so2)
+  end
+
   describe "when loading current resource" do
 
     it "should create a current resource with the name of the new_resource" do
@@ -237,6 +252,72 @@ describe Chef::Provider::Package::Apt do
       ).and_return(@shell_out)
       expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
     end
+
+    it "downgrades when requested" do
+      ubuntu1804downgrade_stubs
+      so = instance_double(Mixlib::ShellOut, stdout: "apt 1.6~beta1 (amd64)\notherstuff\n")
+      so2 = instance_double(Mixlib::ShellOut, error?: false)
+      allow(@provider).to receive(:shell_out).with("apt-get --version").and_return(so)
+      allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.6~beta1", "gt", "1.1.0").and_return(so2)
+
+      @new_resource.package_name("libmysqlclient-dev")
+      @new_resource.version("5.1.41-3ubuntu12.7")
+      real_package_out = <<~RPKG_STDOUT
+        libmysqlclient-dev:
+          Installed: 5.1.41-3ubuntu12.10
+          Candidate: 5.1.41-3ubuntu12.10
+          Version table:
+         *** 5.1.41-3ubuntu12.10 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main packages
+                100 /var/lib/dpkg/status
+             5.1.41-3ubuntu12.7 0
+                500 http://security.ubuntu.com/ubuntu/ lucid-security/main packages
+             5.1.41-3ubuntu12 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid/main packages
+      RPKG_STDOUT
+      real_package = double(stdout: real_package_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
+        "apt-cache", "policy", "libmysqlclient-dev",
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
+      ).and_return(real_package)
+      expect(@provider).to receive(:shell_out_compacted!).with(
+        "apt-get", "-q", "-y", "--allow-downgrades", "-o", "Dpkg::Options::=--force-confdef", "-o", "Dpkg::Options::=--force-confold", "install", "libmysqlclient-dev=5.1.41-3ubuntu12.7",
+        env: { "DEBIAN_FRONTEND" => "noninteractive" },
+        timeout: @timeout
+      )
+      @provider.run_action(:install)
+    end
+
+    it "raises an exception if bad version specified" do
+      @new_resource.package_name("libmysqlclient-dev")
+      @new_resource.version("non_existent")
+      real_package_out = <<~RPKG_STDOUT
+        libmysqlclient-dev:
+          Installed: 5.1.41-3ubuntu12.10
+          Candidate: 5.1.41-3ubuntu12.10
+          Version table:
+         *** 5.1.41-3ubuntu12.10 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid-updates/main packages
+                100 /var/lib/dpkg/status
+             5.1.41-3ubuntu12.7 0
+                500 http://security.ubuntu.com/ubuntu/ lucid-security/main packages
+             5.1.41-3ubuntu12 0
+                500 http://us.archive.ubuntu.com/ubuntu/ lucid/main packages
+      RPKG_STDOUT
+      real_package = double(stdout: real_package_out, exitstatus: 0)
+      expect(@provider).to receive(:shell_out_compacted!).with(
+        "apt-cache", "policy", @new_resource.package_name,
+        env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
+        timeout: @timeout
+      ).and_return(real_package)
+      expect(@provider).to receive(:shell_out_compacted!).with(
+        "apt-cache", "showpkg", @new_resource.package_name,
+        env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
+        timeout: @timeout
+      ).and_return(real_package)
+      expect { @provider.run_action(:install) }.to raise_error(Chef::Exceptions::Package)
+    end
   end
 
   context "after loading the current resource" do
@@ -257,21 +338,6 @@ describe Chef::Provider::Package::Apt do
       })
     end
 
-    def ubuntu1804downgrade_stubs
-      so = instance_double(Mixlib::ShellOut, stdout: "apt 1.6~beta1 (amd64)\notherstuff\n")
-      so2 = instance_double(Mixlib::ShellOut, error?: false)
-      allow(@provider).to receive(:shell_out).with("apt-get --version").and_return(so)
-      allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.6~beta1", "gt", "1.1.0").and_return(so2)
-    end
-
-    def ubuntu1404downgrade_stubs
-      so = instance_double(Mixlib::ShellOut, stdout: "apt 1.0.1ubuntu2 for amd64 compiled on Dec  8 2016 16:23:38\notherstuff\n")
-      so2 = instance_double(Mixlib::ShellOut, error?: true)
-      allow(@provider).to receive(:shell_out).with("apt-get --version").and_return(so)
-      allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "gt", "1.1.0").and_return(so2)
-      allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "eq", "1.1.0").and_return(so2)
-    end
-
     describe "install_package" do
       before(:each) do
         ubuntu1804downgrade_stubs
@@ -513,7 +579,7 @@ describe Chef::Provider::Package::Apt do
         ).and_return(instance_double(
           Mixlib::ShellOut, stdout: "irssi"
         ))
-        expect(logger).to receive(:trace).with("#{@provider.new_resource} is already locked")
+        expect(logger).to receive(:debug).with("#{@provider.new_resource} is already locked")
 
         @provider.action_lock
       end
@@ -534,7 +600,7 @@ describe Chef::Provider::Package::Apt do
         ).and_return(instance_double(
           Mixlib::ShellOut, stdout: ""
         ))
-        expect(logger).to receive(:trace).with("#{@provider.new_resource} is already unlocked")
+        expect(logger).to receive(:debug).with("#{@provider.new_resource} is already unlocked")
 
         @provider.action_unlock
       end
@@ -590,7 +656,7 @@ describe Chef::Provider::Package::Apt do
       end
     end
 
-    describe "#action_install" do
+    describe "#action_upgrade" do
       it "should run dpkg to compare versions if an existing version is installed" do
         allow(@provider).to receive(:get_current_versions).and_return("1.4.0")
         allow(@new_resource).to receive(:allow_downgrade).and_return(false)

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

@@ -61,6 +61,7 @@ describe Chef::Provider::Package::Bff do
       allow(@provider).to receive(:shell_out_compacted).and_return(@empty_status)
       allow(::File).to receive(:exist?).with(@new_resource.source).and_return(false)
       @provider.load_current_resource
+      @provider.action = :install
       @provider.define_resource_requirements
       expect { @provider.process_resource_requirements }.to raise_error(Chef::Exceptions::Package)
     end

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

@@ -47,6 +47,11 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     allow(provider).to receive(:choco_exe).and_return(choco_exe)
     local_list_obj = double(stdout: local_list_stdout)
     allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-l", "-r", { returns: [0, 2], timeout: timeout }).and_return(local_list_obj)
+    allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "2.1.0"))
+  end
+
+  after(:each) do
+    provider.instance_variable_set(:@get_choco_version, nil)
   end
 
   def allow_remote_list(package_names, args = nil)
@@ -61,9 +66,9 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     remote_list_obj = double(stdout: remote_list_stdout)
     package_names.each do |pkg|
       if args
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, *args, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", pkg, *args, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
       else
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
       end
     end
   end
@@ -78,6 +83,18 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     end
   end
 
+  describe "choco searches change with the version" do
+    it "Choco V1 uses List" do
+      allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "1.4.0"))
+      expect(provider.query_command).to eql("list")
+    end
+
+    it "Choco V2 uses Search" do
+      allow(provider).to receive(:powershell_exec!).with("#{choco_exe} --version").and_return(double(result: "2.1.0"))
+      expect(provider.query_command).to eql("search")
+    end
+  end
+
   describe "#candidate_version" do
     it "should set the candidate_version to the latest version when not pinning" do
       allow_remote_list(["git"])
@@ -150,7 +167,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       new_resource.package_name("package-does-not-exist")
       new_resource.returns([0])
       allow(provider).to receive(:shell_out_compacted!)
-        .with(choco_exe, "list", "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
+        .with(choco_exe, provider.query_command, "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
         .and_raise(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
       expect { provider.send(:available_packages) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
     end

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

@@ -66,7 +66,7 @@ describe Chef::Provider::Package::Deb do
       it "does not reconfigure the package if the package is not installed" do
         allow(provider).to receive(:get_current_versions).and_return(nil)
         allow(provider.load_current_resource).to receive(:version).and_return(nil)
-        expect(logger).to receive(:trace).with("apt_package[emacs] is NOT installed - nothing to do")
+        expect(logger).to receive(:debug).with("apt_package[emacs] is NOT installed - nothing to do")
         expect(provider).not_to receive(:reconfig_package)
         provider.run_action(:reconfig)
         expect(new_resource).not_to be_updated_by_last_action
@@ -75,7 +75,7 @@ describe Chef::Provider::Package::Deb do
       it "does not reconfigure the package if no response_file is given" do
         allow(provider).to receive(:get_current_versions).and_return("1.0")
         allow(new_resource).to receive(:response_file).and_return(nil)
-        expect(logger).to receive(:trace).with("apt_package[emacs] no response_file provided - nothing to do")
+        expect(logger).to receive(:debug).with("apt_package[emacs] no response_file provided - nothing to do")
         expect(provider).not_to receive(:reconfig_package)
         provider.run_action(:reconfig)
         expect(new_resource).not_to be_updated_by_last_action
@@ -86,7 +86,7 @@ describe Chef::Provider::Package::Deb do
         allow(new_resource).to receive(:response_file).and_return(true)
         expect(provider).to receive(:get_preseed_file).and_return(false)
         allow(provider).to receive(:preseed_package).and_return(false)
-        expect(logger).to receive(:trace).with("apt_package[emacs] preseeding has not changed - nothing to do")
+        expect(logger).to receive(:debug).with("apt_package[emacs] preseeding has not changed - nothing to do")
         expect(provider).not_to receive(:reconfig_package)
         provider.run_action(:reconfig)
         expect(new_resource).not_to be_updated_by_last_action

data/spec/unit/provider/package/dnf/python_helper_spec.rb

@@ -23,6 +23,7 @@ require "spec_helper"
 exclude_test = !(%w{rhel fedora amazon}.include?(ohai[:platform_family]) && File.exist?("/usr/bin/dnf"))
 describe Chef::Provider::Package::Dnf::PythonHelper, :requires_root, external: exclude_test do
   let(:helper) { Chef::Provider::Package::Dnf::PythonHelper.instance }
+  before(:each) { Singleton.__init__(Chef::Provider::Package::Dnf::PythonHelper) }
 
   it "propagates stacktraces on stderr from the forked subprocess", :rhel do
     allow(helper).to receive(:dnf_command).and_return("ruby -e 'raise \"your hands in the air\"'")