chef 18.2.7-x64-mingw-ucrt → 18.4.2-x64-mingw-ucrt

data/spec/unit/compliance/reporter/chef_server_automate_spec.rb

@@ -170,7 +170,7 @@ describe Chef::Compliance::Reporter::ChefServerAutomate do
           "X-Ops-Userid" => "spec-node",
           "X-Remote-Request-Id" => /.+/,
         }
-      ).to_return(status: 200)
+      ).to_return(status: 200, body: "OK")
 
     expect(reporter.send_report(inspec_report)).to eq(true)
 

data/spec/unit/delayed_evaluator_spec.rb

@@ -0,0 +1,35 @@
+#
+# Copyright:: Copyright (c) Progress Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "spec_helper"
+
+describe Chef::DelayedEvaluator do
+  let(:magic) { "This is magic!" }
+  let(:de) { Chef::DelayedEvaluator.new { magic } }
+
+  describe "#inspect" do
+    it "inspects the result rather than the Proc" do
+      expect(de.inspect).to eq("lazy { (evaluates to) #{magic.inspect} }")
+    end
+  end
+
+  describe "#call" do
+    it "evaluates correctly" do
+      expect(de.call).to eq(magic)
+    end
+  end
+end

data/spec/unit/mixin/homebrew_user_spec.rb

@@ -47,6 +47,8 @@ describe Chef::Mixin::HomebrewUser do
     let(:user) { nil }
     let(:brew_owner) { 2001 }
     let(:default_brew_path) { "/usr/local/bin/brew" }
+    let(:default_brew_path_arm) { "/opt/homebrew/bin/brew" }
+    let(:default_brew_path_linux) { "/home/linuxbrew/.linuxbrew/bin/brew" }
     let(:stat_double) do
       d = double
       expect(d).to receive(:uid).and_return(brew_owner)
@@ -59,16 +61,38 @@ describe Chef::Mixin::HomebrewUser do
         expect(Etc).to receive(:getpwuid).with(brew_owner).and_return(OpenStruct.new(name: "name"))
       end
 
-      it "returns the owner of the brew executable when it is at a default location" do
-        expect(File).to receive(:exist?).with(default_brew_path).and_return(true)
-        expect(File).to receive(:stat).with(default_brew_path).and_return(stat_double)
+      def false_unless_specific_value(object, method, value)
+        allow(object).to receive(method).and_return(false)
+        allow(object).to receive(method).with(value).and_return(true)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for x86_64 machines" do
+        false_unless_specific_value(File, :exist?, default_brew_path)
+        false_unless_specific_value(File, :executable?, default_brew_path)
+        allow(File).to receive(:stat).with(default_brew_path).and_return(stat_double)
+        expect(homebrew_user.find_homebrew_uid(user)).to eq(brew_owner)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for arm machines" do
+        false_unless_specific_value(File, :exist?, default_brew_path_arm)
+        false_unless_specific_value(File, :executable?, default_brew_path_arm)
+        allow(File).to receive(:stat).with(default_brew_path_arm).and_return(stat_double)
+        expect(homebrew_user.find_homebrew_uid(user)).to eq(brew_owner)
+      end
+
+      it "returns the owner of the brew executable when it is at a default location for linux machines" do
+        false_unless_specific_value(File, :exist?, default_brew_path_linux)
+        false_unless_specific_value(File, :executable?, default_brew_path_linux)
+        allow(File).to receive(:stat).with(default_brew_path_linux).and_return(stat_double)
         expect(homebrew_user.find_homebrew_uid(user)).to eq(brew_owner)
       end
 
       it "returns the owner of the brew executable when it is not at a default location" do
-        expect(File).to receive(:exist?).with(default_brew_path).and_return(false)
+        allow_any_instance_of(ExampleHomebrewUser).to receive(:which).and_return("/foo")
+        false_unless_specific_value(File, :exist?, "/foo")
+        false_unless_specific_value(File, :executable?, "/foo")
         allow(homebrew_user).to receive_message_chain(:shell_out, :stdout, :strip).and_return("/foo")
-        expect(File).to receive(:stat).with("/foo").and_return(stat_double)
+        allow(File).to receive(:stat).with("/foo").and_return(stat_double)
         expect(homebrew_user.find_homebrew_uid(user)).to eq(brew_owner)
       end
 
@@ -78,8 +102,7 @@ describe Chef::Mixin::HomebrewUser do
   describe "when the homebrew user is not provided" do
 
     it "raises an error if no executable is found" do
-      expect(File).to receive(:exist?).with(default_brew_path).and_return(false)
-      allow(homebrew_user).to receive_message_chain(:shell_out, :stdout, :strip).and_return("")
+      expect(File).to receive(:exist?).and_return(nil).at_least(:once)
       expect { homebrew_user.find_homebrew_uid(user) }.to raise_error(Chef::Exceptions::CannotDetermineHomebrewOwner)
     end
 

data/spec/unit/node/vivid_mash_spec.rb

@@ -364,20 +364,53 @@ describe Chef::Node::AttrArray do
 
   context "#<<" do
     it "converts a Hash appended with #<< to a VividMash" do
+      expect(root).to receive(:reset_cache).with(nil)
       array << { "three" => "four" }
       expect(array[3].class).to eql(Chef::Node::VividMash)
     end
 
     it "deeply converts objects appended with #<<" do
+      expect(root).to receive(:reset_cache).with(nil)
       array << [ { "three" => [ 0, 1] } ]
       expect(array[3].class).to eql(Chef::Node::AttrArray)
       expect(array[3][0].class).to eql(Chef::Node::VividMash)
       expect(array[3][0]["three"].class).to eql(Chef::Node::AttrArray)
     end
+
+    it "does not invalidate root DeepMergeCache if VividMash top-level key" do
+      # We're checking that __path__ is used to avoid full DeepMergeCache invalidation
+      expect(root).to receive(:reset_cache).with("array")
+      expect(root).not_to receive(:reset_cache).with(nil)
+
+      attr_array = Chef::Node::AttrArray.new([ 0, 1, 2 ])
+      vivid = Chef::Node::VividMash.new(
+        { "one" => { "two" => { "three" => "four" } }, "array" => attr_array },
+        root
+      )
+      vivid["array"] << 3
+    end
+
+    it "does not send reset_cache with nil if VividMashi nested key" do
+      # We're checking that __path__ is used to avoid full DeepMergeCache invalidation,
+      # and that it is invalidating the top-level key
+      expect(root).to receive(:reset_cache).with("array")
+      expect(root).not_to receive(:reset_cache).with(nil)
+
+      attr_array = Chef::Node::AttrArray.new([ 0, 1, 2 ])
+      vivid = Chef::Node::VividMash.new(
+        {
+          "one" => { "two" => { "three" => "four" } },
+          "array" => { "nested" => attr_array },
+        },
+        root
+      )
+      vivid["array"]["nested"] << 3
+    end
   end
 
   context "#[]=" do
     it "assigning a Hash into an array converts it to VividMash" do
+      expect(root).to receive(:reset_cache).with(nil)
       array[0] = { "zero" => "zero2" }
       expect(array[0].class).to eql(Chef::Node::VividMash)
     end
@@ -385,6 +418,7 @@ describe Chef::Node::AttrArray do
 
   context "#push" do
     it "pushing a Hash into an array converts it to VividMash" do
+      expect(root).to receive(:reset_cache).with(nil)
       array.push({ "three" => "four" })
       expect(array[3].class).to eql(Chef::Node::VividMash)
     end
@@ -392,6 +426,7 @@ describe Chef::Node::AttrArray do
 
   context "#unshift" do
     it "unshifting a Hash into an array converts it to VividMash" do
+      expect(root).to receive(:reset_cache).with(nil)
       array.unshift({ "zero" => "zero2" })
       expect(array[0].class).to eql(Chef::Node::VividMash)
     end
@@ -399,6 +434,7 @@ describe Chef::Node::AttrArray do
 
   context "#insert" do
     it "inserting a Hash into an array converts it to VividMash" do
+      expect(root).to receive(:reset_cache).with(nil)
       array.insert(1, { "zero" => "zero2" })
       expect(array[1].class).to eql(Chef::Node::VividMash)
     end
@@ -406,6 +442,7 @@ describe Chef::Node::AttrArray do
 
   context "#collect!" do
     it "converts Hashes" do
+      expect(root).to receive(:reset_cache).at_least(:once).with(nil)
       array.collect! { |x| { "zero" => "zero2" } }
       expect(array[1].class).to eql(Chef::Node::VividMash)
     end
@@ -413,6 +450,7 @@ describe Chef::Node::AttrArray do
 
   context "#map!" do
     it "converts Hashes" do
+      expect(root).to receive(:reset_cache).with(nil)
       array.map! { |x| { "zero" => "zero2" } }
       expect(array[1].class).to eql(Chef::Node::VividMash)
     end
@@ -420,6 +458,7 @@ describe Chef::Node::AttrArray do
 
   context "#compact!" do
     it "VividMashes remain VividMashes" do
+      expect(root).to receive(:reset_cache).with(nil)
       array = Chef::Node::AttrArray.new(
         [ nil, { "one" => "two" }, nil ],
         root
@@ -432,6 +471,7 @@ describe Chef::Node::AttrArray do
 
   context "#fill" do
     it "inserts VividMashes for Hashes" do
+      expect(root).to receive(:reset_cache).at_least(:once).with(nil)
       array.fill({ "one" => "two" })
       expect(array[0].class).to eql(Chef::Node::VividMash)
     end
@@ -439,6 +479,7 @@ describe Chef::Node::AttrArray do
 
   context "#flatten!" do
     it "flattens sub-arrays maintaining VividMashes in them" do
+      expect(root).to receive(:reset_cache).with(nil)
       array = Chef::Node::AttrArray.new(
         [ [ { "one" => "two" } ], [ { "one" => "two" } ] ],
         root
@@ -451,6 +492,7 @@ describe Chef::Node::AttrArray do
 
   context "#replace" do
     it "replaces the array converting hashes to mashes" do
+      expect(root).to receive(:reset_cache).with(nil)
       array.replace([ { "foo" => "bar" } ])
       expect(array[0].class).to eql(Chef::Node::VividMash)
     end

data/spec/unit/node_spec.rb

@@ -303,6 +303,12 @@ describe Chef::Node do
         expect(node["tags"]).to eq(%w{one two three four})
       end
 
+      it "should let you use untag as a convince method for the tags attribute" do
+        node.normal["tags"] = %w{one two three four}
+        node.untag("three", "four")
+        expect(node["tags"]).to eq(%w{one two})
+      end
+
       it "normal_unless sets a value even if default or override attrs are set" do
         node.default[:decontamination] = true
         node.override[:decontamination] = false

data/spec/unit/provider/apt_repository_spec.rb

@@ -246,33 +246,43 @@ C5986B4F1257FFA86632CBA746181433FBB75451
   describe "#build_repo" do
     it "creates a repository string" do
       target = "deb      http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil)).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [])).to eql(target)
     end
 
     it "creates a repository string with spaces" do
       target = "deb      http://test/uri%20with%20spaces unstable main\n"
-      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil)).to eql(target)
+      expect(provider.build_repo("http://test/uri with spaces", "unstable", "main", false, nil, [])).to eql(target)
     end
 
     it "creates a repository string with no distribution" do
       target = "deb      http://test/uri main\n"
-      expect(provider.build_repo("http://test/uri", nil, "main", false, nil)).to eql(target)
+      expect(provider.build_repo("http://test/uri", nil, "main", false, nil, [])).to eql(target)
     end
 
     it "creates a repository string with source" do
       target = "deb      http://test/uri unstable main\ndeb-src  http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, true)).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, [], true)).to eql(target)
     end
 
-    it "creates a repository string with options" do
+    it "creates a repository string with trusted" do
       target = "deb      [trusted=yes] http://test/uri unstable main\n"
-      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil)).to eql(target)
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, nil, [])).to eql(target)
+    end
+
+    it "creates a repository string with custom options" do
+      target = "deb      [by-hash=no] http://test/uri unstable main\n"
+      expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, ["by-hash=no"])).to eql(target)
+    end
+
+    it "creates a repository string with trusted, arch, and custom options" do
+      target = "deb      [arch=amd64 trusted=yes by-hash=no] http://test/uri unstable main\n"
+      expect(provider.build_repo("http://test/uri", "unstable", "main", true, "amd64", ["by-hash=no"])).to eql(target)
     end
 
     it "handles a ppa repo" do
       target = "deb      http://ppa.launchpad.net/chef/main/ubuntu unstable main\n"
       expect(provider).to receive(:make_ppa_url).with("ppa:chef/main").and_return("http://ppa.launchpad.net/chef/main/ubuntu")
-      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil)).to eql(target)
+      expect(provider.build_repo("ppa:chef/main", "unstable", "main", false, nil, [])).to eql(target)
     end
   end
 end

data/spec/unit/provider/launchd_spec.rb

@@ -197,7 +197,7 @@ describe Chef::Provider::Launchd do
     describe "with an :delete action" do
       describe "and the ld file is present" do
         before(:each) do
-          allow(File).to receive(:exists?).and_return(true)
+          allow(File).to receive(:exist?).and_return(true)
           allow(provider).to receive(
             :manage_service
           ).with(:disable).and_return(true)
@@ -218,7 +218,7 @@ describe Chef::Provider::Launchd do
 
       describe "and the ld file is not present" do
         before(:each) do
-          allow(File).to receive(:exists?).and_return(false)
+          allow(File).to receive(:exist?).and_return(false)
           allow(provider).to receive(
             :manage_plist
           ).with(:delete).and_return(true)

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

@@ -65,8 +65,8 @@ describe Chef::Provider::Mount::Aix do
 
     @provider = Chef::Provider::Mount::Aix.new(@new_resource, @run_context)
 
-    allow(::File).to receive(:exists?).with("/dev/sdz1").and_return true
-    allow(::File).to receive(:exists?).with("/tmp/foo").and_return true
+    allow(::File).to receive(:exist?).with("/dev/sdz1").and_return true
+    allow(::File).to receive(:exist?).with("/tmp/foo").and_return true
   end
 
   def stub_mounted(provider, mounted_output)

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

@@ -22,10 +22,11 @@ describe Chef::Provider::Mount::Linux do
   end
 
   before(:each) do
-    allow(::File).to receive(:exists?).with("/dev/sdz1").and_return true
-    allow(::File).to receive(:exists?).with("/tmp/foo").and_return true
-    allow(::File).to receive(:exists?).with("//192.168.11.102/Share/backup").and_return true
-    allow(::File).to receive(:exists?).with("//192.168.11.102/Share/backup folder").and_return true
+    allow(::File).to receive(:exist?).with("/etc/fstab").and_call_original
+    allow(::File).to receive(:exist?).with("/dev/sdz1").and_return true
+    allow(::File).to receive(:exist?).with("/tmp/foo").and_return true
+    allow(::File).to receive(:exist?).with("//192.168.11.102/Share/backup").and_return true
+    allow(::File).to receive(:exist?).with("//192.168.11.102/Share/backup folder").and_return true
     allow(::File).to receive(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
     allow(::File).to receive(:realpath).with("/tmp/foo").and_return "/tmp/foo"
   end
@@ -127,4 +128,4 @@ describe Chef::Provider::Mount::Linux do
     end
   end
 
-end
+end

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

@@ -34,8 +34,8 @@ describe Chef::Provider::Mount::Mount do
 
     @provider = Chef::Provider::Mount::Mount.new(@new_resource, @run_context)
 
-    allow(::File).to receive(:exists?).with("/dev/sdz1").and_return true
-    allow(::File).to receive(:exists?).with("/tmp/foo").and_return true
+    allow(::File).to receive(:exist?).with("/dev/sdz1").and_return true
+    allow(::File).to receive(:exist?).with("/tmp/foo").and_return true
     allow(::File).to receive(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
     allow(::File).to receive(:realpath).with("/tmp/foo").and_return "/tmp/foo"
   end
@@ -83,12 +83,12 @@ describe Chef::Provider::Mount::Mount do
     end
 
     it "should raise an error if the mount device does not exist" do
-      allow(::File).to receive(:exists?).with("/dev/sdz1").and_return false
+      allow(::File).to receive(:exist?).with("/dev/sdz1").and_return false
       expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
     it "should not call mountable? with load_current_resource - CHEF-1565" do
-      allow(::File).to receive(:exists?).with("/dev/sdz1").and_return false
+      allow(::File).to receive(:exist?).with("/dev/sdz1").and_return false
       expect(@provider).to receive(:mounted?).and_return(true)
       expect(@provider).to receive(:enabled?).and_return(true)
       expect(@provider).not_to receive(:mountable?)
@@ -100,12 +100,12 @@ describe Chef::Provider::Mount::Mount do
       @new_resource.device_type :uuid
       @new_resource.device "d21afe51-a0fe-4dc6-9152-ac733763ae0a"
       expect(@provider).to receive(:shell_out_compacted).with("/sbin/findfs", "UUID=d21afe51-a0fe-4dc6-9152-ac733763ae0a").and_return(status)
-      expect(::File).to receive(:exists?).with("").and_return(false)
+      expect(::File).to receive(:exist?).with("").and_return(false)
       expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
     it "should raise an error if the mount point does not exist" do
-      allow(::File).to receive(:exists?).with("/tmp/foo").and_return false
+      allow(::File).to receive(:exist?).with("/tmp/foo").and_return false
       expect { @provider.load_current_resource; @provider.mountable? }.to raise_error(Chef::Exceptions::Mount)
     end
 
@@ -521,8 +521,8 @@ describe Chef::Provider::Mount::Mount do
 
         @provider = Chef::Provider::Mount::Mount.new(@new_resource, @run_context)
 
-        allow(::File).to receive(:exists?).with("cephserver:6789:/").and_return true
-        allow(::File).to receive(:exists?).with("/tmp/bar").and_return true
+        allow(::File).to receive(:exist?).with("cephserver:6789:/").and_return true
+        allow(::File).to receive(:exist?).with("/tmp/bar").and_return true
         allow(::File).to receive(:realpath).with("cephserver:6789:/").and_return "cephserver:6789:/"
         allow(::File).to receive(:realpath).with("/tmp/bar").and_return "/tmp/foo"
       end

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

@@ -63,11 +63,16 @@ describe Chef::Provider::Package::Apt do
     allow(@provider).to receive(:shell_out).with("dpkg", "--compare-versions", "1.0.1ubuntu2", "eq", "1.1.0").and_return(so2)
   end
 
+  def get_pkg_name_str(name)
+    # Package name with or without anchors attached to it based on the flag.
+    @new_resource.anchor_package_regex ? "^#{name}$" : name
+  end
+
   describe "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_compacted!).with(
-        "apt-cache", "policy", @new_resource.package_name,
+        "apt-cache", "policy", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(@shell_out)
@@ -107,7 +112,7 @@ describe Chef::Provider::Package::Apt do
       POLICY_STDOUT
       policy = double(stdout: policy_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "conic-smarms",
+        "apt-cache", "policy", get_pkg_name_str("conic-smarms"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(policy)
@@ -116,7 +121,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "conic-smarms",
+        "apt-cache", "showpkg", get_pkg_name_str("conic-smarms"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -135,7 +140,7 @@ describe Chef::Provider::Package::Apt do
       VPKG_STDOUT
       virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient15-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient15-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(virtual_package)
@@ -159,7 +164,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "libmysqlclient15-dev",
+        "apt-cache", "showpkg", get_pkg_name_str("libmysqlclient15-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -178,7 +183,7 @@ describe Chef::Provider::Package::Apt do
       RPKG_STDOUT
       real_package = double(stdout: real_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(real_package)
@@ -195,7 +200,7 @@ describe Chef::Provider::Package::Apt do
       VPKG_STDOUT
       virtual_package = double(stdout: virtual_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "mp3-decoder",
+        "apt-cache", "policy", get_pkg_name_str("mp3-decoder"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(virtual_package)
@@ -222,7 +227,7 @@ describe Chef::Provider::Package::Apt do
       SHOWPKG_STDOUT
       showpkg = double(stdout: showpkg_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "showpkg", "mp3-decoder",
+        "apt-cache", "showpkg", get_pkg_name_str("mp3-decoder"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(showpkg)
@@ -236,7 +241,7 @@ describe Chef::Provider::Package::Apt do
       @new_resource.default_release("lenny-backports")
       @new_resource.provider(nil)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "-o", "APT::Default-Release=lenny-backports", "policy", "irssi",
+        "apt-cache", "-o", "APT::Default-Release=lenny-backports", "policy", get_pkg_name_str("irssi"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(@shell_out)
@@ -246,7 +251,7 @@ describe Chef::Provider::Package::Apt do
     it "raises an exception if a source is specified (CHEF-5113)" do
       @new_resource.source "pluto"
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", @new_resource.package_name,
+        "apt-cache", "policy", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
         timeout: @timeout
       ).and_return(@shell_out)
@@ -277,7 +282,7 @@ describe Chef::Provider::Package::Apt do
       RPKG_STDOUT
       real_package = double(stdout: real_package_out, exitstatus: 0)
       expect(@provider).to receive(:shell_out_compacted!).with(
-        "apt-cache", "policy", "libmysqlclient-dev",
+        "apt-cache", "policy", get_pkg_name_str("libmysqlclient-dev"),
         env: { "DEBIAN_FRONTEND" => "noninteractive" },
         timeout: @timeout
       ).and_return(real_package)
@@ -307,12 +312,12 @@ describe Chef::Provider::Package::Apt do
       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,
+        "apt-cache", "policy", get_pkg_name_str(@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,
+        "apt-cache", "showpkg", get_pkg_name_str(@new_resource.package_name),
         env: { "DEBIAN_FRONTEND" => "noninteractive" } ,
         timeout: @timeout
       ).and_return(real_package)

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

@@ -47,9 +47,20 @@ 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"))
+    # Mock the local file system choco queries
+    allow(provider).to receive(:get_local_pkg_dirs).and_return(%w{chocolatey ConEmu})
+    allow(provider).to receive(:fetch_package_versions_local).and_return({ "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" })
+  end
+
+  after(:each) do
+    provider.instance_variable_set(:@get_choco_version, nil)
   end
 
   def allow_remote_list(package_names, args = nil)
+    # Ensure that when we set this, we invalidate any cache since we're changing
+    # the returned data on purpose
+    provider.invalidate_cache
     remote_list_stdout = <<~EOF
       Chocolatey v0.9.9.11
       chocolatey|0.9.9.11
@@ -59,12 +70,10 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       munin-node|1.6.1.20130823
     EOF
     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)
-      else
-        allow(provider).to receive(:shell_out_compacted!).with(choco_exe, "list", "-r", pkg, { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
-      end
+    if args
+      allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", *(package_names.sort + args), { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
+    else
+      allow(provider).to receive(:shell_out_compacted!).with(choco_exe, provider.query_command, "-r", *(package_names.sort), { returns: [0, 2], timeout: timeout }).and_return(remote_list_obj)
     end
   end
 
@@ -78,6 +87,25 @@ 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 "bulk_query changes the search behaviour" do
+    it "should respect bulk_query when getting working out what to search" do
+      new_resource.bulk_query(true)
+      expect(provider.collect_package_requests).to eql(["*"])
+    end
+  end
+
   describe "#candidate_version" do
     it "should set the candidate_version to the latest version when not pinning" do
       allow_remote_list(["git"])
@@ -121,6 +149,13 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
     end
   end
 
+  describe "the query cache should be invalidated if the config is clean" do
+    it "should return false to cache_is_valid? by default" do
+      provider.invalidate_cache
+      expect(provider.cache_is_valid?).to eql(false)
+    end
+  end
+
   describe "#load_current_resource" do
     it "should return a current_resource" do
       expect(provider.load_current_resource).to be_kind_of(Chef::Resource::ChocolateyPackage)
@@ -131,7 +166,16 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       expect(provider.current_resource.package_name).to eql(["git"])
     end
 
-    it "should load and downcase names in the installed_packages hash" do
+    it "should load and downcase names in the installed_packages hash (with disk provider)" do
+      new_resource.use_choco_list(false)
+      provider.load_current_resource
+      expect(provider.send(:installed_packages)).to eql(
+        { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" }
+      )
+    end
+
+    it "should load and downcase names in the installed_packages hash (with choco list provider)" do
+      new_resource.use_choco_list(true)
       provider.load_current_resource
       expect(provider.send(:installed_packages)).to eql(
         { "chocolatey" => "0.9.9.11", "conemu" => "15.10.25.0" }
@@ -150,7 +194,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
@@ -508,7 +552,7 @@ describe "behavior when Chocolatey is not installed" do
   end
 
   let(:error_regex) do
-    /Could not locate.*install.*cookbook.*PowerShell.*GetEnvironmentVariable/m
+    /Could not locate.*installer.*resource.*PowerShell.*GetEnvironmentVariable/m
   end
 
   context "#choco_exe" do