chef 16.2.73-universal-mingw32 → 16.3.38-universal-mingw32

data/spec/integration/recipes/notifying_block_spec.rb

@@ -23,7 +23,7 @@ describe "notifying_block" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "notifying_block test one" do

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -1221,7 +1221,7 @@ describe "Recipe DSL methods" do
 
       it "utf-8 dsl names work" do
         recipe = converge do
-          Straße("blah") {}
+          Straße("blah") {} # rubocop: disable Naming/AsciiIdentifiers
         end
         expect(recipe.logged_warnings).to eq ""
         expect(BaseThingy.created_resource).to eq(UTF8Thingy)

data/spec/integration/recipes/resource_converge_if_changed_spec.rb

@@ -6,6 +6,7 @@ describe "Resource::ActionClass#converge_if_changed" do
   module Namer
     extend self
     attr_accessor :current_index
+
     def incrementing_value
       @incrementing_value += 1
       @incrementing_value
@@ -30,6 +31,7 @@ describe "Resource::ActionClass#converge_if_changed" do
         property :state2, default: "default_state2"
         property :sensitive1, default: "default_dontprintme", sensitive: true
         attr_accessor :converged
+
         def initialize(*args)
           super
           @converged = 0

data/spec/integration/recipes/resource_load_spec.rb

@@ -6,6 +6,7 @@ describe "Resource.load_current_value" do
   module Namer
     extend self
     attr_accessor :current_index
+
     def incrementing_value
       @incrementing_value += 1
       @incrementing_value
@@ -194,6 +195,7 @@ describe "simple load_current_value tests" do
   let(:resource_class) do
     Class.new(Chef::Resource) do
       attr_writer :index # this is our hacky global state
+
       def index; @index ||= 1; end
 
       property :myindex, Integer

data/spec/integration/recipes/unified_mode_spec.rb

@@ -6,7 +6,7 @@ describe "Unified Mode" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
 
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 

data/spec/integration/recipes/use_partial_spec.rb

@@ -22,7 +22,7 @@ describe "notifying_block" do
   include IntegrationSupport
   include Chef::Mixin::ShellOut
 
-  let(:chef_dir) { File.expand_path("../../../../bin", __FILE__) }
+  let(:chef_dir) { File.expand_path("../../../bin", __dir__) }
   let(:chef_client) { "bundle exec chef-client --minimal-ohai" }
 
   when_the_repository "has a cookbook with partial resources" do

data/spec/scripts/ssl-serve.rb

@@ -12,7 +12,7 @@ require "webrick/https"
 
 $ssl = true
 
-CHEF_SPEC_DATA = File.expand_path("../../data", __FILE__)
+CHEF_SPEC_DATA = File.expand_path("../data", __dir__)
 cert_text = File.read(File.expand_path("ssl/chef-rspec.cert", CHEF_SPEC_DATA))
 cert = OpenSSL::X509::Certificate.new(cert_text)
 key_text = File.read(File.expand_path("ssl/chef-rspec.key", CHEF_SPEC_DATA))

data/spec/spec_helper.rb

@@ -24,10 +24,10 @@ module Shell
   IRB = nil unless defined? IRB
 end
 
-$LOAD_PATH.unshift File.expand_path("../..", __FILE__)
+$LOAD_PATH.unshift File.expand_path("..", __dir__)
 
-$LOAD_PATH.unshift File.expand_path("../../chef-config/lib", __FILE__)
-$LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../chef-config/lib", __dir__)
+$LOAD_PATH.unshift File.expand_path("../chef-utils/lib", __dir__)
 
 require "rubygems"
 require "rspec/mocks"
@@ -116,6 +116,7 @@ RSpec.configure do |config|
   config.include(MockShellout::RSpec)
   config.filter_run focus: true
   config.filter_run_excluding external: true
+  config.raise_on_warning = true
 
   # Explicitly disable :should syntax
   # And set max_formatted_output_length to nil to prevent RSpec from doing truncation.
@@ -125,6 +126,7 @@ RSpec.configure do |config|
   end
   config.mock_with :rspec do |c|
     c.syntax = :expect
+    c.allow_message_expectations_on_nil = false
   end
 
   # Only run these tests on platforms that are also chef workstations
@@ -173,7 +175,6 @@ RSpec.configure do |config|
   config.filter_run_excluding requires_root: true unless root?
   config.filter_run_excluding requires_root_or_running_windows: true unless root? || windows?
   config.filter_run_excluding requires_unprivileged_user: true if root?
-  config.filter_run_excluding uses_diff: true unless has_diff?
   config.filter_run_excluding openssl_gte_101: true unless openssl_gte_101?
   config.filter_run_excluding openssl_lt_101: true unless openssl_lt_101?
   config.filter_run_excluding aes_256_gcm_only: true unless aes_256_gcm?
@@ -239,6 +240,11 @@ RSpec.configure do |config|
 
     Chef::Config.reset
 
+    Chef::Log.setup!
+
+    Chef::Config[:log_level] = :fatal
+    Chef::Log.level(Chef::Config[:log_level])
+
     # By default, treat deprecation warnings as errors in tests.
     Chef::Config.treat_deprecation_warnings_as_errors(true)
 

data/spec/support/chef_helpers.rb

@@ -18,14 +18,6 @@ CHEF_SPEC_DATA = File.expand_path(File.dirname(__FILE__) + "/../data/")
 CHEF_SPEC_ASSETS = File.expand_path(File.dirname(__FILE__) + "/../functional/assets/")
 CHEF_SPEC_BACKUP_PATH = File.join(Dir.tmpdir, "test-backup-path")
 
-Chef::Config[:log_level] = :fatal
-Chef::Config[:persistent_queue] = false
-Chef::Config[:file_backup_path] = CHEF_SPEC_BACKUP_PATH
-
-Chef::Log.init(StringIO.new)
-Chef::Log.level(Chef::Config.log_level)
-Chef::Config.solo(false)
-
 def sha256_checksum(path)
   OpenSSL::Digest.hexdigest("SHA256", File.read(path))
 end
@@ -48,22 +40,11 @@ def make_tmpname(prefix_suffix, n = nil)
   path << suffix
 end
 
-# NOTE:
-# This is a temporary fix to get tests passing on systems that have no `diff`
-# until we can replace shelling out to `diff` with ruby diff-lcs
-def has_diff?
-  diff_cmd = Mixlib::ShellOut.new("diff -v")
-  diff_cmd.run_command
-  true
-rescue Errno::ENOENT
-  false
-end
-
 # This is a helper to determine if the ruby in the PATH contains
 # win32/service gem. windows_service_manager tests create a windows
 # service that starts with the system ruby and requires this gem.
 def system_windows_service_gem?
-  windows_service_gem_check_command = %{ruby -r "win32/daemon" -e ":noop" > #{DEV_NULL} 2>&1}
+  windows_service_gem_check_command = %{ruby -r "win32/daemon" -e ":noop" > #{File::NULL} 2>&1}
   if defined?(Bundler)
     Bundler.with_unbundled_env do
       # This returns true if the gem can be loaded

data/spec/support/platform_helpers.rb

@@ -193,8 +193,6 @@ def supports_cloexec?
   Fcntl.const_defined?("F_SETFD") && Fcntl.const_defined?("FD_CLOEXEC")
 end
 
-DEV_NULL = windows? ? "NUL" : "/dev/null"
-
 def selinux_enabled?
   # This code is currently copied from lib/chef/util/selinux to make
   # specs independent of product.

data/spec/support/shared/functional/file_resource.rb

@@ -366,7 +366,6 @@ shared_examples_for "a configured file resource" do
   include_context "diff disabled"
 
   before do
-    Chef::Log.level = :info
     Chef::Config[:ssl_verify_mode] = :verify_none
   end
 

data/spec/support/shared/integration/knife_support.rb

@@ -39,10 +39,7 @@ module KnifeSupport
 
     # Work on machines where we can't access /var
     Dir.mktmpdir("checksums") do |checksums_cache_dir|
-      Chef::Config[:cache_options] = {
-        path: checksums_cache_dir,
-        skip_expires: true,
-      }
+      Chef::Config[:syntax_check_cache_path] = checksums_cache_dir
 
       # This is Chef::Knife.run without load_commands--we'll load stuff
       # ourselves, thank you very much
@@ -55,8 +52,6 @@ module KnifeSupport
                 STDIN
               end
 
-      old_loggers = Chef::Log.loggers
-      old_log_level = Chef::Log.level
       begin
         puts "knife: #{args.join(" ")}" if DEBUG
         subcommand_class = Chef::Knife.subcommand_class_from(args)
@@ -115,9 +110,7 @@ module KnifeSupport
       rescue SystemExit => e
         exit_code = e.status
       ensure
-        Chef::Log.use_log_devices(old_loggers)
-        Chef::Log.level = old_log_level
-        Chef::Config.delete(:cache_options)
+        Chef::Config.delete(:syntax_check_cache_path)
         Chef::Config.delete(:concurrency)
       end
 

data/spec/support/shared/unit/application_dot_d.rb

@@ -41,7 +41,6 @@ shared_examples_for "an application that loads a dot d" do
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_return("foo 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_return("bar 0")
       expect(IO).to receive(:read).with(Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_return("strings 0")
-      allow(app).to receive(:apply_config).with(anything, Chef::Config.platform_specific_path("/etc/chef/client.rb")).and_call_original.ordered
       expect(app).to receive(:apply_config).with("foo 0", Pathname.new("#{client_d_dir}/00-foo.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("bar 0", Pathname.new("#{client_d_dir}/01-bar.rb").cleanpath.to_s).and_call_original.ordered
       expect(app).to receive(:apply_config).with("strings 0", Pathname.new("#{client_d_dir}/02-strings.rb").cleanpath.to_s).and_call_original.ordered

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/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/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/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"
 

data/spec/unit/dsl/platform_introspection_spec.rb

@@ -21,6 +21,7 @@ require "chef/dsl/platform_introspection"
 
 class LanguageTester
   attr_reader :node
+
   def initialize(node)
     @node = node
   end

data/spec/unit/event_dispatch/dispatcher_spec.rb

@@ -61,6 +61,7 @@ describe Chef::EventDispatch::Dispatcher do
       let(:event_sink) do
         Class.new(Chef::EventDispatch::Base) do
           attr_reader :synchronized_cookbook_args
+
           def synchronized_cookbook(cookbook_name)
             @synchronized_cookbook_args = [cookbook_name]
           end
@@ -79,6 +80,7 @@ describe Chef::EventDispatch::Dispatcher do
     let(:event_sink_1) do
       Class.new(Chef::EventDispatch::Base) do
         attr_reader :synchronized_cookbook_args
+
         def synchronized_cookbook(cookbook_name)
           @synchronized_cookbook_args = [cookbook_name]
         end
@@ -87,6 +89,7 @@ describe Chef::EventDispatch::Dispatcher do
     let(:event_sink_2) do
       Class.new(Chef::EventDispatch::Base) do
         attr_reader :synchronized_cookbook_args
+
         def synchronized_cookbook(cookbook_name, cookbook)
           @synchronized_cookbook_args = [cookbook_name, cookbook]
         end

data/spec/unit/json_compat_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../spec_helper"
+require "spec_helper"
 require "chef/json_compat"
 
 describe Chef::JSONCompat do

data/spec/unit/knife/bootstrap_spec.rb

@@ -1861,12 +1861,10 @@ describe Chef::Knife::Bootstrap do
           let(:connection_protocol) { "ssh" }
 
           it "warns, prompts for password, then reconnects with a password-enabled configuration using the new password" do
-            question_mock = double("question")
             expect(knife).to receive(:do_connect).and_raise(expected_error_password_prompt)
             expect(knife.ui).to receive(:warn).with(/Failed to auth.*/)
-            expect(knife.ui).to receive(:ask).and_yield(question_mock).and_return("newpassword")
+            expect(knife.ui).to receive(:ask).and_return("newpassword")
             # Ensure that we set echo off to prevent showing password on the screen
-            expect(question_mock).to receive(:echo=).with false
             expect(knife).to receive(:do_connect) do |opts|
               expect(opts[:password]).to eq "newpassword"
             end
@@ -1878,12 +1876,10 @@ describe Chef::Knife::Bootstrap do
           let(:connection_protocol) { "winrm" }
 
           it "warns, prompts for password, then reconnects with a password-enabled configuration using the new password for" do
-            question_mock = double("question")
             expect(knife).to receive(:do_connect).and_raise(expected_error_password_prompt_winrm)
             expect(knife.ui).to receive(:warn).with(/Failed to auth.*/)
-            expect(knife.ui).to receive(:ask).and_yield(question_mock).and_return("newpassword")
+            expect(knife.ui).to receive(:ask).and_return("newpassword")
             # Ensure that we set echo off to prevent showing password on the screen
-            expect(question_mock).to receive(:echo=).with false
             expect(knife).to receive(:do_connect) do |opts|
               expect(opts[:password]).to eq "newpassword"
             end

data/spec/unit/knife/cookbook_upload_spec.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_helper"))
+require "spec_helper"
 
 require "chef/cookbook_uploader"
 require "timeout"
@@ -40,7 +40,6 @@ describe Chef::Knife::CookbookUpload do
     allow(cookbook_loader).to receive(:load_cookbooks).and_return(cookbook_loader)
     allow(cookbook_loader).to receive(:compile_metadata).and_return(nil)
     allow(cookbook_loader).to receive(:freeze_versions).and_return(nil)
-    allow(cookbook_loader).to receive(:unlink!).and_return(nil)
     cookbook_loader
   end
 
@@ -60,7 +59,7 @@ describe Chef::Knife::CookbookUpload do
 
   before(:each) do
     allow(Chef::CookbookLoader).to receive(:new).and_return(cookbook_loader)
-    allow(Chef::CookbookLoader).to receive(:copy_to_tmp_dir_from_array).and_return(cookbook_loader)
+    allow(Chef::CookbookLoader).to receive(:copy_to_tmp_dir_from_array).and_yield(cookbook_loader)
   end
 
   describe "with --concurrency" do
@@ -70,7 +69,6 @@ describe Chef::Knife::CookbookUpload do
       test_cookbook = Chef::CookbookVersion.new("test_cookbook", "/tmp/blah")
       allow(cookbook_loader).to receive(:each).and_yield("test_cookbook", test_cookbook)
       allow(cookbook_loader).to receive(:cookbook_names).and_return(["test_cookbook"])
-      allow(cookbook_loader).to receive(:tmp_working_dir_path).and_return("/tmp/blah")
       expect(Chef::CookbookUploader).to receive(:new)
         .with( kind_of(Array), { force: nil, concurrency: 3 })
         .and_return(double("Chef::CookbookUploader", upload_cookbooks: true))
@@ -323,19 +321,18 @@ describe Chef::Knife::CookbookUpload do
 
         context "when cookbook path is an array" do
           it "should warn users that no cookbooks exist" do
-            knife.config[:cookbook_path] = ["/chef-repo/cookbooks", "/home/user/cookbooks"]
-            expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path].join(', ')}'\. Use --cookbook-path to specify the desired path\./
-            )
+            cookbook_path = windows? ? "C:/chef-repo/cookbooks" : "/chef-repo/cookbooks"
+            knife.config[:cookbook_path] = [cookbook_path, "/home/user/cookbooks"]
+            expect(knife.ui).to receive(:warn).with("Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path].join(", ")}'. Use --cookbook-path to specify the desired path.")
             knife.run
           end
         end
 
         context "when cookbook path is a string" do
           it "should warn users that no cookbooks exist" do
-            knife.config[:cookbook_path] = "/chef-repo/cookbooks"
+            knife.config[:cookbook_path] = windows? ? "C:/chef-repo/cookbooks" : "/chef-repo/cookbooks"
             expect(knife.ui).to receive(:warn).with(
-              /Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path]}'\. Use --cookbook-path to specify the desired path\./
+              "Could not find any cookbooks in your cookbook path: '#{knife.config[:cookbook_path]}'. Use --cookbook-path to specify the desired path."
             )
             knife.run
           end

data/spec/unit/log/syslog_spec.rb

@@ -23,25 +23,21 @@ describe "Chef::Log::Syslog", unix_only: true do
 
   before do
     Chef::Log.init(MonoLogger.new(syslog))
-    @old_log_level = Chef::Log.level
     Chef::Log.level = :info
-    @old_loggers = Chef::Log.loggers
-    Chef::Log.use_log_devices([syslog])
-  end
-
-  after do
-    Chef::Log.level = @old_log_level
-    Chef::Log.use_log_devices(@old_loggers)
   end
 
   it "should send message with severity info to syslog." do
     expect(syslog).to receive(:add).with(1, "*** Chef 12.4.0.dev.0 ***", nil)
-    Chef::Log.info("*** Chef 12.4.0.dev.0 ***")
+    expect {
+      Chef::Log.info("*** Chef 12.4.0.dev.0 ***")
+    }.not_to output.to_stderr
   end
 
   it "should send message with severity warning to syslog." do
     expect(syslog).to receive(:add).with(2, "No config file found or specified on command line. Using command line options instead.", nil)
-    Chef::Log.warn("No config file found or specified on command line. Using command line options instead.")
+    expect {
+      Chef::Log.warn("No config file found or specified on command line. Using command line options instead.")
+    }.not_to output.to_stderr
   end
 
   it "should fallback into send message with severity info to syslog when wrong format." do