chef 16.2.50-universal-mingw32 → 16.4.38-universal-mingw32

data/spec/unit/application/solo_spec.rb

@@ -164,6 +164,8 @@ describe Chef::Application::Solo do
   end
 
   context "in local mode" do
+    let(:root_path) { windows? ? "C:/var/chef" : "/var/chef" }
+
     before do
       Chef::Config[:solo_legacy_mode] = false
     end
@@ -197,10 +199,10 @@ describe Chef::Application::Solo do
     end
 
     it "sets the repo path" do
-      expect(Chef::Config).to receive(:find_chef_repo_path).and_return("/var/chef")
+      expect(Chef::Config).to receive(:find_chef_repo_path).and_return(root_path)
       app.reconfigure
       expect(Chef::Config.key?(:chef_repo_path)).to be_truthy
-      expect(Chef::Config[:chef_repo_path]).to eq ("/var/chef")
+      expect(Chef::Config[:chef_repo_path]).to eq (root_path)
     end
 
     it "runs chef-client in local mode" do

data/spec/unit/application_spec.rb

@@ -22,12 +22,10 @@ describe Chef::Application do
   before do
     @original_argv = ARGV.dup
     ARGV.clear
-    Chef::Log.logger = Logger.new(StringIO.new)
     @app = Chef::Application.new
     allow(@app).to receive(:trap)
     allow(Dir).to receive(:chdir).and_return(0)
     allow(@app).to receive(:reconfigure)
-    Chef::Log.init(STDERR)
   end
 
   after do
@@ -254,6 +252,10 @@ describe Chef::Application do
       end
 
       context "when log_level is not set" do
+        before do
+          Chef::Config.delete(:log_level)
+        end
+
         it_behaves_like "log_level_is_auto"
       end
 

data/spec/unit/chef_fs/config_spec.rb

@@ -203,8 +203,8 @@ describe Chef::ChefFS::Config do
         })
       end
 
-      let (:path) { "/roles/foo.json" }
-      let (:entry) { Entry.new(path) }
+      let(:path) { "/roles/foo.json" }
+      let(:entry) { Entry.new(path) }
 
       it "returns the entry's path if the cwd isn't in the config" do
         cfg = Chef::ChefFS::Config.new(config, "/my_repo/cookbooks")

data/spec/unit/chef_fs/diff_spec.rb

@@ -20,17 +20,17 @@ require "spec_helper"
 require "chef/chef_fs/file_pattern"
 require "chef/chef_fs/command_line"
 
-# Removes the date stamp from the diff and replaces it with ' DATE'
-# example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
-# windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
-def remove_os_differences(diff)
-  diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
-  diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
-end
-
 describe "diff", uses_diff: true do
   include FileSystemSupport
 
+  # Removes the date stamp from the diff and replaces it with ' DATE'
+  # example match: "/dev/null\t2012-10-16 16:15:54.000000000 +0000"
+  # windows match: "--- /dev/null\tTue Oct 16 18:04:34 2012"
+  def remove_os_differences(diff)
+    diff = diff.gsub(/([+-]{3}.*)\t.*/, '\1 DATE')
+    diff.gsub(/^@@ -\d(,\d)? \+\d(,\d)? @@/, "CONTEXT_LINE_NUMBERS")
+  end
+
   context "with two filesystems with all types of difference" do
     let(:a) do
       memory_fs("a", {

data/spec/unit/chef_fs/file_system/operation_failed_error_spec.rb

@@ -25,11 +25,9 @@ describe Chef::ChefFS::FileSystem::OperationFailedError do
 
     context "has a cause attribute and HTTP result code is 400" do
       it "include error cause" do
-        allow_message_expectations_on_nil
         response_body = '{"error":["Invalid key test in request body"]}'
-        allow(@response).to receive(:code).and_return("400")
-        allow(@response).to receive(:body).and_return(response_body)
-        exception = Net::HTTPClientException.new("(exception) unauthorized", @response)
+        response = double(:response, code: "400", body: response_body)
+        exception = Net::HTTPClientException.new("(exception) unauthorized", response)
         expect do
           raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, exception), error_message
         end.to raise_error(Chef::ChefFS::FileSystem::OperationFailedError, "#{error_message} cause: #{response_body}")

data/spec/unit/chef_fs/{parallelizer.rb → parallelizer_spec.rb}

@@ -405,7 +405,7 @@ describe Chef::ChefFS::Parallelizer do
         expect do
           b = enum.enum_for(:each)
           b.next
-        end.to raise_error
+        end.to raise_error(RuntimeError, "each() called on parallel enumerable twice simultaneously! Bad mojo")
       end
     end
   end

data/spec/unit/client_spec.rb

@@ -749,9 +749,12 @@ describe Chef::Client do
 
     context "when any directory of cookbook_path contains no cookbook" do
       it "raises CookbookNotFound error" do
+        invalid_cookbook_path = windows? ? "C:/path/to/invalid/cookbook_path" : "/path/to/invalid/cookbook_path"
+        msg = "None of the cookbook paths set in Chef::Config[:cookbook_path], [\"#{invalid_cookbook_path}\"], contain any cookbooks"
+
         expect do
           client.send(:assert_cookbook_path_not_empty, nil)
-        end.to raise_error(Chef::Exceptions::CookbookNotFound, 'None of the cookbook paths set in Chef::Config[:cookbook_path], ["/path/to/invalid/cookbook_path"], contain any cookbooks')
+        end.to raise_error(Chef::Exceptions::CookbookNotFound, msg)
       end
     end
   end

data/spec/unit/cookbook/gem_installer_spec.rb

@@ -95,7 +95,8 @@ describe Chef::Cookbook::GemInstaller do
 
   it "skip metadata installation when Chef::Config[:skip_gem_metadata_installation] is set to true" do
     Chef::Config[:skip_gem_metadata_installation] = true
-    expect(gem_installer.install).to_not receive(:shell_out!)
+    expect(gem_installer).to_not receive(:shell_out!)
+    expect(gem_installer.install).to be_nil
   end
 
   it "install metadata when Chef::Config[:skip_gem_metadata_installation] is not true" do

data/spec/unit/cookbook/synchronizer_spec.rb

@@ -217,6 +217,8 @@ describe Chef::CookbookSynchronizer do
       path: "/tmp/cookbook_a_template_default_tempfile")
   end
 
+  let(:root) { windows? ? "C:/file-cache/cookbooks/cookbook_a" : "/file-cache/cookbooks/cookbook_a" }
+
   def setup_common_files_missing_expectations
     # Files are not in the cache:
     expect(file_cache).to receive(:key?)
@@ -234,7 +236,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_recipes_default_rb", "cookbooks/cookbook_a/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Fetch and copy default.rb attribute file
     expect(server_api).to receive(:streaming_request)
@@ -244,7 +246,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_attributes_default_rb", "cookbooks/cookbook_a/attributes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_missing_expectations
@@ -262,7 +264,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_file_default_tempfile", "cookbooks/cookbook_a/files/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     expect(server_api).to receive(:streaming_request)
       .with("http://chef.example.com/ffffff")
@@ -271,7 +273,7 @@ describe Chef::CookbookSynchronizer do
       .with("/tmp/cookbook_a_template_default_tempfile", "cookbooks/cookbook_a/templates/default/apache2.conf.erb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   def setup_common_files_chksum_mismatch_expectations
@@ -292,11 +294,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
 
     # Current file has fff000, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("fff000").at_least(:once)
 
     # Fetch and copy default.rb attribute file
@@ -308,11 +310,11 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
 
     # Current file has fff000, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("fff000").at_least(:once)
   end
 
@@ -334,7 +336,7 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
 
     # Fetch and copy apache2.conf template
     expect(server_api).to receive(:streaming_request)
@@ -345,16 +347,16 @@ describe Chef::CookbookSynchronizer do
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("fff000")
 
     # Current file has fff000
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("fff000")
   end
 
@@ -369,23 +371,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc123, want abc123
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .with("#{root}/recipes/default.rb")
       .and_return("abc123").at_least(:once)
 
     # Current file has abc456, want abc456
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .with("#{root}/attributes/default.rb")
       .and_return("abc456").at_least(:once)
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/recipes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+      .and_return("#{root}/recipes/default.rb")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/attributes/default.rb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+      .and_return("#{root}/attributes/default.rb")
   end
 
   def setup_no_lazy_files_and_templates_present_expectations
@@ -399,23 +401,23 @@ describe Chef::CookbookSynchronizer do
 
     # Current file has abc124, want abc124
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .with("#{root}/default/megaman.conf")
       .and_return("abc124")
 
     # Current file has abc125, want abc125
     expect(Chef::CookbookVersion).to receive(:checksum_cookbook_file)
-      .with("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .with("#{root}/templates/default/apache2.conf.erb")
       .and_return("abc125")
 
     # :load called twice
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/default/megaman.conf")
+      .and_return("#{root}/default/megaman.conf")
     expect(file_cache).to receive(:load)
       .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
       .twice
-      .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+      .and_return("#{root}/templates/default/apache2.conf.erb")
   end
 
   describe "#server_api" do
@@ -535,19 +537,19 @@ describe Chef::CookbookSynchronizer do
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/recipes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/recipes/default.rb")
+          .and_return("#{root}/recipes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/attributes/default.rb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/attributes/default.rb")
+          .and_return("#{root}/attributes/default.rb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/templates/default/apache2.conf.erb", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/templates/default/apache2.conf.erb")
+          .and_return("#{root}/templates/default/apache2.conf.erb")
         expect(file_cache).to receive(:load)
           .with("cookbooks/cookbook_a/files/default/megaman.conf", false)
           .once
-          .and_return("/file-cache/cookbooks/cookbook_a/files/default/megaman.conf")
+          .and_return("#{root}/files/default/megaman.conf")
         expect(Chef::Log).to receive(:warn)
           .with("skipping cookbook synchronization! DO NOT LEAVE THIS ENABLED IN PRODUCTION!!!")
           .once

data/spec/unit/data_bag_spec.rb

@@ -240,20 +240,23 @@ describe Chef::DataBag do
 
       it "should raise an error if the configured data_bag_path is invalid" do
         file_dir_stub(@paths.first, false)
+        msg = "Data bag path '#{windows? ? "C:/var/chef" : "/var/chef"}/data_bags' not found. Please create this directory."
 
         expect do
           Chef::DataBag.load("foo")
-        end.to raise_error Chef::Exceptions::InvalidDataBagPath, "Data bag path '/var/chef/data_bags' not found. Please create this directory."
+        end.to raise_error Chef::Exceptions::InvalidDataBagPath, msg
       end
 
     end
 
     describe "data bag with string path" do
-      it_should_behave_like "data bag in solo mode", "/var/chef/data_bags"
+      it_should_behave_like "data bag in solo mode", "#{windows? ? "C:/var/chef" : "/var/chef"}/data_bags"
     end
 
     describe "data bag with array path" do
-      it_should_behave_like "data bag in solo mode", ["/var/chef/data_bags", "/var/chef/data_bags_2"]
+      it_should_behave_like "data bag in solo mode", %w{data_bags data_bags_2}.map { |data_bag|
+        "#{windows? ? "C:/var/chef" : "/var/chef"}/#{data_bag}"
+      }
     end
   end
 

data/spec/unit/data_collector_spec.rb

@@ -15,7 +15,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "chef/data_collector"
 require "socket"
 
@@ -39,6 +39,13 @@ describe Chef::DataCollector do
   let(:new_resource) do
     new_resource = Chef::Resource::File.new("/tmp/a-file.txt")
     new_resource.checksum nil
+    # This next line is a hack to work around the fact that the name property will not have been autovivified yet
+    # in these unit tests which breaks some assumptions.  Really the Formatters::ErrorMapper.resource_failed and
+    # related APIs need to properly walk and get properties on the resource rather than walking through instance
+    # variables, but the ErrorMappers probably pre-date the conversion to properties.  But this next line is necesary
+    # to populate the name_property instance variable (which will happen naturally during the course of running the
+    # provider, so I don't think this is a user-visibile bug).
+    new_resource.path
     new_resource
   end
 
@@ -780,6 +787,13 @@ describe Chef::DataCollector do
         let(:resource_record) do
           rec = resource_record_for(new_resource, current_resource, nil, :create, "failed", "1234")
           rec["error_message"] = "imperial to metric conversion error"
+          rec["error"] = {
+            "class" => exception.class,
+            "message" => exception.message,
+            "backtrace" => exception.backtrace,
+            "description" => error_description,
+          }
+
           [ rec ]
         end
         let(:status) { "failure" }
@@ -808,6 +822,13 @@ describe Chef::DataCollector do
           rec = resource_record_for(new_resource, nil, nil, :create, "failed", "1234")
           rec["before"] = {}
           rec["error_message"] = "imperial to metric conversion error"
+          rec["error"] = {
+            "class" => exception.class,
+            "message" => exception.message,
+            "backtrace" => exception.backtrace,
+            "description" => error_description,
+          }
+
           [ rec ]
         end
         let(:status) { "failure" }
@@ -842,6 +863,13 @@ describe Chef::DataCollector do
         let(:resource_record) do
           rec1 = resource_record_for(new_resource, current_resource, nil, :create, "failed", "1234")
           rec1["error_message"] = "imperial to metric conversion error"
+          rec1["error"] = {
+            "class" => exception.class,
+            "message" => exception.message,
+            "backtrace" => exception.backtrace,
+            "description" => error_description,
+          }
+
           rec2 = resource_record_for(unprocessed_resource, nil, nil, :nothing, "unprocessed", "")
           [ rec1, rec2 ]
         end

data/spec/unit/decorator_spec.rb

@@ -18,37 +18,37 @@
 
 require "spec_helper"
 
-def impersonates_a(klass)
-  it "#is_a?(#{klass}) is true" do
-    expect(decorator.is_a?(klass)).to be true
-  end
+describe Chef::Decorator do
+  def self.impersonates_a(klass)
+    it "#is_a?(#{klass}) is true" do
+      expect(decorator.is_a?(klass)).to be true
+    end
 
-  it "#is_a?(Chef::Decorator) is true" do
-    expect(decorator.is_a?(Chef::Decorator)).to be true
-  end
+    it "#is_a?(Chef::Decorator) is true" do
+      expect(decorator.is_a?(Chef::Decorator)).to be true
+    end
 
-  it "#kind_of?(#{klass}) is true" do
-    expect(decorator.is_a?(klass)).to be true
-  end
+    it "#kind_of?(#{klass}) is true" do
+      expect(decorator.is_a?(klass)).to be true
+    end
 
-  it "#kind_of?(Chef::Decorator) is true" do
-    expect(decorator.is_a?(Chef::Decorator)).to be true
-  end
+    it "#kind_of?(Chef::Decorator) is true" do
+      expect(decorator.is_a?(Chef::Decorator)).to be true
+    end
 
-  it "#instance_of?(#{klass}) is false" do
-    expect(decorator.instance_of?(klass)).to be false
-  end
+    it "#instance_of?(#{klass}) is false" do
+      expect(decorator.instance_of?(klass)).to be false
+    end
 
-  it "#instance_of?(Chef::Decorator) is true" do
-    expect(decorator.instance_of?(Chef::Decorator)).to be true
-  end
+    it "#instance_of?(Chef::Decorator) is true" do
+      expect(decorator.instance_of?(Chef::Decorator)).to be true
+    end
 
-  it "#class is Chef::Decorator" do
-    expect(decorator.class).to eql(Chef::Decorator)
+    it "#class is Chef::Decorator" do
+      expect(decorator.class).to eql(Chef::Decorator)
+    end
   end
-end
 
-describe Chef::Decorator do
   let(:obj) {}
   let(:decorator) { Chef::Decorator.new(obj) }