chef 15.17.4-universal-mingw32 → 16.0.257-universal-mingw32

data/spec/integration/solo/solo_spec.rb

@@ -165,7 +165,7 @@ describe Chef::Dist::SOLOEXEC do
         ruby_block "sleeping" do
           block do
             retries = 200
-            while IO.read(Chef::Config[:log_location]) !~ /.* is running, will wait for it to finish and then run./
+            while IO.read(Chef::Config[:log_location][0]) !~ /.* is running, will wait for it to finish and then run./
               sleep 0.1
               raise "we ran out of retries" if ( retries -= 1 ) <= 0
             end
@@ -189,13 +189,13 @@ describe Chef::Dist::SOLOEXEC do
 
           # Instantiate the first chef-solo run
           threads << Thread.new do
-            s1 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
+            s1 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s1)
           end
 
           # Instantiate the second chef-solo run
           threads << Thread.new do
-            s2 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default'  -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
+            s2 = Process.spawn("#{chef_solo} -c \"#{path_to("config/solo.rb")}\" -o 'x::default' -l debug -L #{path_to("logs/runs.log")}", chdir: chef_dir)
             Process.waitpid(s2)
           end
 

data/spec/scripts/ssl-serve.rb

@@ -12,7 +12,7 @@ require "webrick/https"
 
 $ssl = true
 
-CHEF_SPEC_DATA = File.expand_path("../data", __dir__)
+CHEF_SPEC_DATA = File.expand_path("../../data", __FILE__)
 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,11 +24,10 @@ module Shell
   IRB = nil unless defined? IRB
 end
 
-$LOAD_PATH.unshift File.expand_path("..", __dir__)
-$LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-$LOAD_PATH.unshift File.expand_path("../chef-config/lib", __dir__)
-$LOAD_PATH.unshift File.expand_path("../chef-utils/lib", __dir__)
-$LOAD_PATH.unshift File.dirname(__FILE__)
+$LOAD_PATH.unshift File.expand_path("../..", __FILE__)
+
+$LOAD_PATH.unshift File.expand_path("../../chef-config/lib", __FILE__)
+$LOAD_PATH.unshift File.expand_path("../../chef-utils/lib", __FILE__)
 
 require "rubygems"
 require "rspec/mocks"
@@ -69,12 +68,14 @@ end
 
 # If you want to load anything into the testing environment
 # without versioning it, add it to spec/support/local_gems.rb
-require "spec/support/local_gems.rb" if File.exist?(File.join(File.dirname(__FILE__), "support", "local_gems.rb"))
+require "spec/support/local_gems.rb" if File.exists?(File.join(File.dirname(__FILE__), "support", "local_gems.rb"))
 
 # Explicitly require spec helpers that need to load first
 require "spec/support/platform_helpers"
 require "spec/support/shared/unit/mock_shellout"
 
+require "spec/support/recipe_dsl_helper"
+
 # Autoloads support files
 # Excludes support/platforms by default
 # Do not change the gsub.
@@ -124,7 +125,6 @@ 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
@@ -139,18 +139,15 @@ RSpec.configure do |config|
 
   config.filter_run_excluding windows_only: true unless windows?
   config.filter_run_excluding not_supported_on_windows: true if windows?
-  config.filter_run_excluding not_supported_on_macos: true if macos?
-  config.filter_run_excluding macos_only: true unless macos?
-  config.filter_run_excluding macos_1013: true unless macos_1013?
-  config.filter_run_excluding macos_gte_1014: true unless macos_gte_1014?
+  config.filter_run_excluding not_supported_on_macos: true if mac_osx?
+  config.filter_run_excluding macos_only: true unless mac_osx?
+  config.filter_run_excluding macos_1014: true unless mac_osx_1014?
   config.filter_run_excluding not_supported_on_aix: true if aix?
   config.filter_run_excluding not_supported_on_solaris: true if solaris?
   config.filter_run_excluding not_supported_on_gce: true if gce?
-  config.filter_run_excluding not_supported_on_nano: true if windows_nano_server?
   config.filter_run_excluding win2012r2_only: true unless windows_2012r2?
   config.filter_run_excluding windows64_only: true unless windows64?
   config.filter_run_excluding windows32_only: true unless windows32?
-  config.filter_run_excluding windows_nano_only: true unless windows_nano_server?
   config.filter_run_excluding windows_gte_10: true unless windows_gte_10?
   config.filter_run_excluding windows_lt_10: true if windows_gte_10?
   config.filter_run_excluding ruby64_only: true unless ruby_64bit?
@@ -169,7 +166,7 @@ RSpec.configure do |config|
   config.filter_run_excluding linux_only: true unless linux?
   config.filter_run_excluding aix_only: true unless aix?
   config.filter_run_excluding suse_only: true unless suse?
-  config.filter_run_excluding sles11: true unless sles11?
+  config.filter_run_excluding opensuse: true unless opensuse?
   config.filter_run_excluding debian_family_only: true unless debian_family?
   config.filter_run_excluding supports_cloexec: true unless supports_cloexec?
   config.filter_run_excluding selinux_only: true unless selinux_enabled?

data/spec/support/chef_helpers.rb

@@ -27,7 +27,7 @@ Chef::Log.level(Chef::Config.log_level)
 Chef::Config.solo(false)
 
 def sha256_checksum(path)
-  OpenSSL::Digest.hexdigest("SHA256", File.read(path))
+  OpenSSL::Digest::SHA256.hexdigest(File.read(path))
 end
 
 # extracted from Ruby < 2.5 to return a unique temp file name without creating it
@@ -65,7 +65,7 @@ end
 def system_windows_service_gem?
   windows_service_gem_check_command = %{ruby -r "win32/daemon" -e ":noop" > #{DEV_NULL} 2>&1}
   if defined?(Bundler)
-    Bundler.with_clean_env do
+    Bundler.with_unbundled_env do
       # This returns true if the gem can be loaded
       system(windows_service_gem_check_command)
     end

data/spec/support/lib/chef/resource/zen_follower.rb

@@ -22,6 +22,8 @@ class Chef
   class Resource
     class ZenFollower < Chef::Resource
 
+      provides :zen_follower
+
       provides :follower, platform: "zen"
 
       def master(arg = nil)

data/spec/support/platform_helpers.rb

@@ -3,6 +3,7 @@ require "chef/mixin/shell_out"
 require "ohai/mixin/http_helper"
 require "ohai/mixin/gce_metadata"
 require "chef/mixin/powershell_out"
+require "chef/version_class"
 
 class ShellHelpers
   extend Chef::Mixin::ShellOut
@@ -87,11 +88,6 @@ def windows_powershell_dsc?
   supports_dsc
 end
 
-def windows_nano_server?
-  require "chef/platform/query_helpers"
-  Chef::Platform.windows_nano_server?
-end
-
 def windows_user_right?(right)
   return false unless windows?
 
@@ -99,12 +95,39 @@ def windows_user_right?(right)
   Chef::ReservedNames::Win32::Security.get_account_right(ENV["USERNAME"]).include?(right)
 end
 
-def macos_1013?
-  macos? && Gem::Requirement.new("~> 10.13.0").satisfied_by?(Gem::Version.new(ohai[:platform_version]))
+def mac_osx_106?
+  if File.exists? "/usr/bin/sw_vers"
+    result = ShellHelpers.shell_out("/usr/bin/sw_vers")
+    result.stdout.each_line do |line|
+      if line =~ /^ProductVersion:\s10.6.*$/
+        return true
+      end
+    end
+  end
+
+  false
+end
+
+def mac_osx_1014?
+  if mac_osx?
+    ver = Chef::Version.new(ohai[:platform_version])
+    return ver.major == 10 && ver.minor == 14
+  end
+
+  false
 end
 
-def macos_gte_1014?
-  macos? && Gem::Requirement.new(">= 10.14").satisfied_by?(Gem::Version.new(ohai[:platform_version]))
+def mac_osx?
+  if File.exists? "/usr/bin/sw_vers"
+    result = ShellHelpers.shell_out("/usr/bin/sw_vers")
+    result.stdout.each_line do |line|
+      if line =~ /^ProductName:\sMac OS X.*$/
+        return true
+      end
+    end
+  end
+
+  false
 end
 
 # detects if the hardware is 64-bit (evaluates to true in "WOW64" mode in a 32-bit app on a 64-bit system)
@@ -117,24 +140,26 @@ def windows32?
   windows? && !windows64?
 end
 
+# def jruby?
+
 def unix?
   !windows?
 end
 
 def linux?
-  RUBY_PLATFORM.match?(/linux/)
+  !!(RUBY_PLATFORM =~ /linux/)
 end
 
-def macos?
-  RUBY_PLATFORM.match?(/darwin/)
+def os_x?
+  !!(RUBY_PLATFORM =~ /darwin/)
 end
 
 def solaris?
-  RUBY_PLATFORM.match?(/solaris/)
+  !!(RUBY_PLATFORM =~ /solaris/)
 end
 
 def freebsd?
-  RUBY_PLATFORM.match?(/freebsd/)
+  !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
 def intel_64bit?
@@ -149,8 +174,8 @@ def rhel6?
   rhel? && !!(ohai[:platform_version].to_i == 6)
 end
 
-def sles11?
-  suse? && !!(ohai[:platform_version].to_i == 11)
+def opensuse?
+  suse? && !!(ohai[:platform_version].to_i >= 15)
 end
 
 def rhel7?
@@ -170,7 +195,7 @@ def debian_family?
 end
 
 def aix?
-  RUBY_PLATFORM.match?(/aix/)
+  !!(RUBY_PLATFORM =~ /aix/)
 end
 
 def wpar?
@@ -206,8 +231,8 @@ def selinux_enabled?
 end
 
 def suse?
-  ::File.exist?("/etc/SuSE-release") ||
-    ( ::File.exist?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) )
+  ::File.exists?("/etc/SuSE-release") ||
+    ( ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) )
 end
 
 def root?

data/spec/support/platforms/win32/spec_service.rb

@@ -26,7 +26,7 @@ if RUBY_PLATFORM =~ /mswin|mingw|windows/
 
     def service_main(*startup_parameters)
       while running?
-        unless File.exist?(@test_service_file)
+        unless File.exists?(@test_service_file)
           File.open(@test_service_file, "wb") do |f|
             f.write("This file is created by SpecService")
           end

data/spec/support/recipe_dsl_helper.rb

@@ -0,0 +1,83 @@
+#
+# This is a helper for functional tests to embed the recipe DSL directly into the rspec example blocks using
+# unified mode.
+#
+# If you wind up wanting to stub/expect on internal details of the resource/provider you are not testing the
+# public API and are trying to write a unit test, which this is not designed for.
+#
+# If you want to start writing full recipes and testing them, doing notifies/subscribes/etc then you are writing
+# an integration test, and not a functional single-resource test, which this is not designed for.
+#
+# Examples:
+#
+# it "creates a file" do
+#   FileUtils.rm_f("/tmp/foo.xyz")
+#   file "/tmp/foo.xyz" do           # please use proper tmpdir though
+#     content "whatever"
+#   end.should_be_updated
+#   expect(IO.read("/tmp/foo.xyz").to eql("content")
+# end
+#
+# it "is idempotent" do
+#   FileUtils.rm_f("/tmp/foo.xyz")
+#   file "/tmp/foo.xyz" do           # please use proper tmpdir though
+#     content "whatever"
+#   end.should_be_updated
+#   file "/tmp/foo.xyz" do           # please use proper tmpdir though
+#     content "whatever"
+#   end.should_not_be_updated
+#   expect(IO.read("/tmp/foo.xyz").to eql("content")
+# end
+#
+# it "has a failure" do
+#   FileUtils.rm_f("/tmp/foo.xyz")
+#   expect { file "/tmp/lksjdflksjdf/foo.xyz" do
+#     content "whatever"
+#   end }.to raise_error(Chef::Exception::EnclosingDirectoryDoesNotExist)
+# end
+#
+module RecipeDSLHelper
+  include Chef::DSL::Recipe
+  def event_dispatch
+    @event_dispatch ||= Chef::EventDispatch::Dispatcher.new
+  end
+
+  def node
+    @node ||= Chef::Node.new.tap do |n|
+      # clone the global ohai data to keep tests fast but reasonably isolated
+      n.consume_external_attrs(OHAI_SYSTEM.data.dup, {})
+    end
+  end
+
+  def run_context
+    @run_context ||= Chef::RunContext.new(node, {}, event_dispatch).tap do |rc|
+      rc.resource_collection.unified_mode = true
+      Chef::Runner.new(rc)
+    end
+  end
+
+  def cookbook_name
+    "rspec"
+  end
+
+  def recipe_name
+    "default"
+  end
+
+  def declare_resource(type, name, created_at: nil, run_context: self.run_context, &resource_attrs_block)
+    created_at = caller[0]
+    rspec_context = self
+    # we slightly abuse the "enclosing_provider" method_missing magic to send methods to the rspec example block so that
+    # rspec `let` methods work as arguments to resource properties
+    resource = super(type, name, created_at: created_at, run_context: run_context, enclosing_provider: rspec_context, &resource_attrs_block)
+    # we also inject these methods to make terse expression of checking the updated status (so it is more readiable and
+    # therefore should get used more -- even though it is "should" vs. "expect")
+    resource.define_singleton_method(:should_be_updated) do
+      rspec_context.expect(self).to be_updated
+    end
+    resource.define_singleton_method(:should_not_be_updated) do
+      rspec_context.expect(self).not_to be_updated
+    end
+    resource
+  end
+end

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

@@ -173,6 +173,6 @@ shared_context Chef::Resource::Directory do
   end
 
   after(:each) do
-    FileUtils.rm_r(path) if File.exist?(path)
+    FileUtils.rm_r(path) if File.exists?(path)
   end
 end

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

@@ -62,7 +62,7 @@ shared_context "a command that can be executed as an alternate user" do
   end
 
   after do
-    File.delete(script_output_path) if File.exist?(script_output_path)
+    File.delete(script_output_path) if File.exists?(script_output_path)
     Dir.rmdir(script_output_dir) if Dir.exist?(script_output_dir)
   end
 end

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

@@ -370,7 +370,7 @@ shared_examples_for "a configured file resource" do
     Chef::Config[:ssl_verify_mode] = :verify_none
   end
 
-  # note the stripping of the drive letter from the tmpdir on windows
+   # note the stripping of the drive letter from the tmpdir on windows
   let(:backup_glob) { File.join(CHEF_SPEC_BACKUP_PATH, test_file_dir.sub(/^([A-Za-z]:)/, ""), "#{file_base}*") }
 
   # Most tests update the resource, but a few do not. We need to test that the
@@ -1038,8 +1038,8 @@ shared_context Chef::Resource::File do
   end
 
   after(:each) do
-    FileUtils.rm_r(path) if File.exist?(path)
-    FileUtils.rm_r(CHEF_SPEC_BACKUP_PATH) if File.exist?(CHEF_SPEC_BACKUP_PATH)
+    FileUtils.rm_r(path) if File.exists?(path)
+    FileUtils.rm_r(CHEF_SPEC_BACKUP_PATH) if File.exists?(CHEF_SPEC_BACKUP_PATH)
   end
 
   after do

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

@@ -30,7 +30,7 @@ shared_context "using Win32::Service" do
     end
 
     # Delete the test_service_file if it exists
-    if File.exist?(test_service_file)
+    if File.exists?(test_service_file)
       File.delete(test_service_file)
     end
   end

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

@@ -39,11 +39,11 @@ shared_context Chef::Resource::WindowsScript do
   end
 
   before(:each) do
-    File.delete(script_output_path) if File.exist?(script_output_path)
+    File.delete(script_output_path) if File.exists?(script_output_path)
   end
 
   after(:each) do
-    File.delete(script_output_path) if File.exist?(script_output_path)
+    File.delete(script_output_path) if File.exists?(script_output_path)
   end
 
   shared_examples_for "a script resource with architecture attribute" do
@@ -99,7 +99,7 @@ shared_context Chef::Resource::WindowsScript do
         end
       end
 
-      context "when the guard's architecture is specified as 32-bit", :not_supported_on_nano do
+      context "when the guard's architecture is specified as 32-bit" do
         let (:guard_architecture) { :i386 }
         it "executes a 32-bit guard" do
           resource.only_if resource_guard_command, architecture: guard_architecture
@@ -107,17 +107,6 @@ shared_context Chef::Resource::WindowsScript do
           expect(get_guard_process_architecture).to eq("x86")
         end
       end
-
-      context "when the guard's architecture is specified as 32-bit", :windows_nano_only do
-        let (:guard_architecture) { :i386 }
-        it "raises an error" do
-          resource.only_if resource_guard_command, architecture: guard_architecture
-          expect { resource.run_action(:run) }.to raise_error(
-            Chef::Exceptions::Win32ArchitectureIncorrect,
-            /cannot execute script with requested architecture 'i386' on Windows Nano Server/
-          )
-        end
-      end
     end
   end
 
@@ -149,7 +138,7 @@ shared_context Chef::Resource::WindowsScript do
 
       after do
         script_file.close! if script_file
-        ::File.delete(script_file.to_path) if script_file && ::File.exist?(script_file.to_path)
+        ::File.delete(script_file.to_path) if script_file && ::File.exists?(script_file.to_path)
       end
 
       include_context "alternate user identity"
@@ -218,8 +207,6 @@ shared_context Chef::Resource::WindowsScript do
 
     context "when evaluating guards" do
       it "has a guard_interpreter attribute set to the short name of the resource" do
-        pending "powershell.exe always exits with 0 on nano" if Chef::Platform.windows_nano_server?
-
         expect(resource.guard_interpreter).to eq(resource.resource_name)
         resource.not_if "findstr.exe /thiscommandhasnonzeroexitstatus"
         expect(Chef::Resource).to receive(:resource_for_node).and_call_original
@@ -238,7 +225,7 @@ shared_context Chef::Resource::WindowsScript do
       it_behaves_like "a script resource with architecture attribute"
     end
 
-    context "when the architecture attribute is :i386", :not_supported_on_nano do
+    context "when the architecture attribute is :i386" do
       let(:resource_architecture) { :i386 }
       it_behaves_like "a script resource with architecture attribute"
     end