chef 14.15.6 → 15.0.293

data/spec/functional/resource/mount_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright 2013-2019, Chef Software Inc.
+# Copyright:: Copyright 2013-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,10 +24,14 @@ require "tmpdir"
 # run this test only for following platforms.
 include_flag = !(%w{debian rhel amazon aix solaris2}.include?(ohai[:platform_family]))
 
-describe Chef::Resource::Mount, :requires_root, external: include_flag do
+describe Chef::Resource::Mount, :requires_root, :skip_travis, external: include_flag do
+  # Disabled in travis because it refuses to let us mount a ramdisk. /dev/ramX does not
+  # exist even after loading the kernel module
+
   include Chef::Mixin::ShellOut
 
   # Platform specific setup, cleanup and validation helpers.
+
   def setup_device_for_mount
     # use ramdisk for creating a test device for mount.
     # This can cleaner if we have chef resource/provider for ramdisk.
@@ -69,7 +73,7 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
   def mount_should_exist(mount_point, device, fstype = nil, options = nil)
     validation_cmd = "mount | grep #{mount_point} | grep #{device} "
     validation_cmd << " | grep #{fstype} " unless fstype.nil?
-    validation_cmd << " | grep #{options.join(",")} " unless options.nil? || options.empty?
+    validation_cmd << " | grep #{options.join(',')} " unless options.nil? || options.empty?
     expect(shell_out(validation_cmd).exitstatus).to eq(0)
   end
 

data/spec/functional/resource/powershell_script_spec.rb

@@ -28,13 +28,13 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
   it_behaves_like "a Windows script running on Windows"
 
-  let(:successful_executable_script_content) { "#{ENV["SystemRoot"]}\\system32\\attrib.exe $env:systemroot" }
-  let(:failed_executable_script_content) { "#{ENV["SystemRoot"]}\\system32\\attrib.exe /badargument" }
+  let(:successful_executable_script_content) { "#{ENV['SystemRoot']}\\system32\\attrib.exe $env:systemroot" }
+  let(:failed_executable_script_content) { "#{ENV['SystemRoot']}\\system32\\attrib.exe /badargument" }
   let(:processor_architecture_script_content) { "echo $env:PROCESSOR_ARCHITECTURE" }
   let(:native_architecture_script_content) { "echo $env:PROCESSOR_ARCHITECTUREW6432" }
   let(:cmdlet_exit_code_not_found_content) { "get-item '.\\thisdoesnotexist'" }
   let(:cmdlet_exit_code_success_content) { "get-item ." }
-  let(:windows_process_exit_code_success_content) { "#{ENV["SystemRoot"]}\\system32\\attrib.exe $env:systemroot" }
+  let(:windows_process_exit_code_success_content) { "#{ENV['SystemRoot']}\\system32\\attrib.exe $env:systemroot" }
   let(:windows_process_exit_code_not_found_content) { "findstr /notavalidswitch" }
   let(:arbitrary_nonzero_process_exit_code) { 4193 }
   let(:arbitrary_nonzero_process_exit_code_content) { "exit #{arbitrary_nonzero_process_exit_code}" }
@@ -231,22 +231,28 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       expect(is_64_bit).to eq(detected_64_bit)
     end
 
-    it "returns 1 if an invalid flag is passed to the interpreter" do
-      pending "powershell.exe always exits with 0 on nano" if Chef::Platform.windows_nano_server?
-
+    it "returns 0 if a valid flag is passed to the interpreter" do
       resource.code(cmdlet_exit_code_success_content)
-      resource.flags(invalid_powershell_interpreter_flag)
-      resource.returns(1)
+      resource.flags(valid_powershell_interpreter_flag)
+      resource.returns(0)
       resource.run_action(:run)
     end
 
-    it "returns 0 if a valid flag is passed to the interpreter" do
+    it "returns 0 if no flag is passed to the interpreter" do
       resource.code(cmdlet_exit_code_success_content)
-      resource.flags(valid_powershell_interpreter_flag)
       resource.returns(0)
       resource.run_action(:run)
     end
 
+    it "returns 1 if an invalid flag is passed to the interpreter" do
+      pending "powershell.exe always exits with 0 on nano" if Chef::Platform.windows_nano_server?
+
+      resource.code(cmdlet_exit_code_success_content)
+      resource.flags(invalid_powershell_interpreter_flag)
+      resource.returns(1)
+      expect { resource.run_action(:run) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed)
+    end
+
     it "raises an error when given a block and a guard_interpreter" do
       resource.guard_interpreter :sh
       resource.only_if { true }
@@ -473,26 +479,26 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       end
 
       it "evaluates a not_if block using the cwd guard parameter" do
-        custom_cwd = "#{ENV["SystemRoot"]}\\system32\\drivers\\etc"
+        custom_cwd = "#{ENV['SystemRoot']}\\system32\\drivers\\etc"
         resource.not_if "exit ! [int32]($pwd.path -eq '#{custom_cwd}')", cwd: custom_cwd
         expect(resource.should_skip?(:run)).to be_truthy
       end
 
       it "evaluates an only_if block using the cwd guard parameter" do
-        custom_cwd = "#{ENV["SystemRoot"]}\\system32\\drivers\\etc"
+        custom_cwd = "#{ENV['SystemRoot']}\\system32\\drivers\\etc"
         resource.only_if "exit ! [int32]($pwd.path -eq '#{custom_cwd}')", cwd: custom_cwd
         expect(resource.should_skip?(:run)).to be_falsey
       end
 
       it "inherits cwd from the parent resource for only_if" do
-        custom_cwd = "#{ENV["SystemRoot"]}\\system32\\drivers\\etc"
+        custom_cwd = "#{ENV['SystemRoot']}\\system32\\drivers\\etc"
         resource.cwd custom_cwd
         resource.only_if "exit ! [int32]($pwd.path -eq '#{custom_cwd}')"
         expect(resource.should_skip?(:run)).to be_falsey
       end
 
       it "inherits cwd from the parent resource for not_if" do
-        custom_cwd = "#{ENV["SystemRoot"]}\\system32\\drivers\\etc"
+        custom_cwd = "#{ENV['SystemRoot']}\\system32\\drivers\\etc"
         resource.cwd custom_cwd
         resource.not_if "exit ! [int32]($pwd.path -eq '#{custom_cwd}')"
         expect(resource.should_skip?(:run)).to be_truthy
@@ -584,8 +590,7 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
         resource.only_if "$true", architecture: :i386
         expect { resource.run_action(:run) }.to raise_error(
           Chef::Exceptions::Win32ArchitectureIncorrect,
-          /cannot execute script with requested architecture 'i386' on Windows Nano Server/
-        )
+          /cannot execute script with requested architecture 'i386' on Windows Nano Server/)
       end
     end
   end

data/spec/functional/resource/reboot_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Resource::Reboot do
   shared_context "testing run context modification" do
     def test_reboot_action(resource)
       reboot_info = resource.run_context.reboot_info
-      expect(reboot_info.keys.sort).to eq(%i{delay_mins reason requested_by timestamp})
+      expect(reboot_info.keys.sort).to eq([:delay_mins, :reason, :requested_by, :timestamp])
       expect(reboot_info[:delay_mins]).to eq(expected[:delay_mins])
       expect(reboot_info[:reason]).to eq(expected[:reason])
       expect(reboot_info[:requested_by]).to eq(expected[:requested_by])

data/spec/functional/resource/remote_file_spec.rb

@@ -134,7 +134,7 @@ describe Chef::Resource::RemoteFile do
       let(:smb_file_local_file_name) { "smb_file.txt" }
       let(:smb_file_local_path) { File.join( smb_share_root_directory, smb_file_local_file_name ) }
       let(:smb_share_name) { "chef_smb_test" }
-      let(:smb_remote_path) { File.join("//#{ENV["COMPUTERNAME"]}", smb_share_name, smb_file_local_file_name).gsub(%r{/}, "\\") }
+      let(:smb_remote_path) { File.join("//#{ENV['COMPUTERNAME']}", smb_share_name, smb_file_local_file_name).gsub(/\//, "\\") }
       let(:smb_file_content) { "hellofun" }
       let(:local_destination_path) { File.join(Dir.tmpdir, make_tmpname("chef_remote_file")) }
       let(:windows_current_user) { ENV["USERNAME"] }
@@ -155,7 +155,7 @@ describe Chef::Resource::RemoteFile do
       before do
         shell_out("net.exe share #{smb_share_name} /delete")
         File.write(smb_file_local_path, smb_file_content )
-        shell_out!("net.exe share #{smb_share_name}=\"#{smb_share_root_directory.gsub(%r{/}, '\\')}\" /grant:\"authenticated users\",read")
+        shell_out!("net.exe share #{smb_share_name}=\"#{smb_share_root_directory.gsub(/\//, '\\')}\" /grant:\"authenticated users\",read")
       end
 
       after do

data/spec/functional/resource/template_spec.rb

@@ -21,7 +21,7 @@ require "spec_helper"
 describe Chef::Resource::Template do
 
   def binread(file)
-    File.open(file, "rb", &:read)
+    File.open(file, "rb") { |f| f.read }
   end
 
   include_context Chef::Resource::File

data/spec/functional/resource/user/dscl_spec.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2019, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,7 @@ require "spec_helper"
 require "chef/mixin/shell_out"
 
 metadata = {
-  mac_osx_only: true,
+  macos_only: true,
   requires_root: true,
 }
 
@@ -121,13 +121,7 @@ describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metada
 
   describe "when password is being set via shadow hash" do
     let(:password) do
-      if node[:platform_version].start_with?("10.7.")
-        # On Mac 10.7 we only need to set the password
-        "c9b3bd1a0cde797eef0eff16c580dab996ba3a21961cccc\
-d0f5e65c61558243e50b1a490088bd4824e3b35562d383ca02260398\
-ef1979b302212ec1c5383d1d05fc8d843"
-      else
-        "c734b6e4787c3727bb35e29fdd92b97c\
+      "c734b6e4787c3727bb35e29fdd92b97c\
 1de12df509577a045728255ec7c6c5f5\
 c18efa05ed02b682ffa7ebc05119900e\
 b1d4880833aa7a190afc13e2bf0936b8\
@@ -135,7 +129,6 @@ b1d4880833aa7a190afc13e2bf0936b8\
 9464a8c234f3919082400b4f939bb77b\
 c5adbbac718b7eb99463a7b679571e0f\
 1c9fef2ef08d0b9e9c2bcf644eed2ffc"
-      end
     end
 
     let(:iterations) { 25000 }

data/spec/functional/resource/user/windows_spec.rb

@@ -47,13 +47,13 @@ describe Chef::Provider::User::Windows, :windows_only do
   end
 
   def backup_secedit_policy
-    backup_command = "secedit /export /cfg #{ENV["TEMP"]}\\secedit_restore.inf /areas SECURITYPOLICY"
+    backup_command = "secedit /export /cfg #{ENV['TEMP']}\\secedit_restore.inf /areas SECURITYPOLICY"
     shell_out(backup_command)
   end
 
   def restore_secedit_policy
     security_database = "C:\\windows\\security\\database\\seceditnew.sdb"
-    restore_command = "secedit /configure /db #{security_database} /cfg #{ENV["TEMP"]}\\secedit_restore.inf /areas SECURITYPOLICY"
+    restore_command = "secedit /configure /db #{security_database} /cfg #{ENV['TEMP']}\\secedit_restore.inf /areas SECURITYPOLICY"
     shell_out(restore_command)
   end
 

data/spec/functional/resource/windows_certificate_spec.rb

@@ -81,9 +81,9 @@ describe Chef::Resource::WindowsCertificate, :windows_only, :appveyor_only do
 
     # Byepassing the validation so that we may create a custom store
     allow_any_instance_of(Chef::Mixin::ParamsValidate)
-      .to receive(:_pv_equal_to)
-      .with(opts, key, to_be)
-      .and_return(true)
+          .to receive(:_pv_equal_to)
+          .with(opts, key, to_be)
+          .and_return(true)
 
     # Creating a custom store for the testing
     create_store(store)

data/spec/functional/resource/windows_service_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
   include_context "using Win32::Service"
 
   let(:username) { "service_spec_user" }
-  let(:qualified_username) { "#{ENV["COMPUTERNAME"]}\\#{username}" }
+  let(:qualified_username) { "#{ENV['COMPUTERNAME']}\\#{username}" }
   let(:password) { "1a2b3c4X!&narf" }
 
   let(:user_resource) do
@@ -36,7 +36,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
   end
 
   let(:global_service_file_path) do
-    "#{ENV["WINDIR"]}\\temp\\#{File.basename(test_service[:service_file_path])}"
+    "#{ENV['WINDIR']}\\temp\\#{File.basename(test_service[:service_file_path])}"
   end
 
   let(:service_params) do
@@ -59,7 +59,7 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
 
   let(:service_resource) do
     r = Chef::Resource::WindowsService.new(service_params[:service_name], run_context)
-    %i{run_as_user run_as_password}.each { |prop| r.send(prop, service_params[prop]) }
+    [:run_as_user, :run_as_password].each { |prop| r.send(prop, service_params[prop]) }
     r
   end
 

data/spec/functional/resource/windows_task_spec.rb

@@ -18,6 +18,7 @@
 
 require "spec_helper"
 require "chef/provider/windows_task"
+require "chef/dist"
 
 describe Chef::Resource::WindowsTask, :windows_only do
   # resource.task.application_name will default to task_name unless resource.command is set
@@ -45,37 +46,37 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "With Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command "chef-client -W"
+          subject.command "#{Chef::Dist::CLIENT} -W"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
           expect(current_resource.task.parameters).to eq("-W")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "chef-client -W"
+          subject.command "#{Chef::Dist::CLIENT} -W"
           subject.run_action(:create)
-          subject.command "chef-client -W"
+          subject.command "#{Chef::Dist::CLIENT} -W"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
 
         it "creates scheduled task and sets command arguments when arguments inclusive single quotes" do
-          subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
           expect(current_resource.task.parameters).to eq("-W -L 'C:\\chef\\chef-ad-join.log'")
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
-          subject.command "chef-client -W -L 'C:\\chef\\chef-ad-join.log'"
+          subject.command "#{Chef::Dist::CLIENT} -W -L 'C:\\chef\\chef-ad-join.log'"
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end
@@ -135,19 +136,19 @@ describe Chef::Resource::WindowsTask, :windows_only do
 
       context "Without Arguments" do
         it "creates scheduled task and sets command arguments" do
-          subject.command "chef-client"
+          subject.command Chef::Dist::CLIENT
           call_for_create_action
           # loading current resource again to check new task is creted and it matches task parameters
           current_resource = call_for_load_current_resource
           expect(current_resource.exists).to eq(true)
-          expect(current_resource.task.application_name).to eq("chef-client")
+          expect(current_resource.task.application_name).to eq(Chef::Dist::CLIENT)
           expect(current_resource.task.parameters).to be_empty
         end
 
         it "does not converge the resource if it is already converged" do
-          subject.command "chef-client"
+          subject.command Chef::Dist::CLIENT
           subject.run_action(:create)
-          subject.command "chef-client"
+          subject.command Chef::Dist::CLIENT
           subject.run_action(:create)
           expect(subject).not_to be_updated_by_last_action
         end

data/spec/functional/resource/yum_package_spec.rb

@@ -443,8 +443,9 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
         expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
       end
 
-      it "downgrade on a local file is ignored" do
+      it "downgrade on a local file is ignored when allow_downgrade is false" do
         preinstall("chef_rpm-1.10-1.#{pkg_arch}.rpm")
+        yum_package.allow_downgrade false
         yum_package.version "1.2-1"
         yum_package.package_name("#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm")
         yum_package.run_action(:install)
@@ -485,6 +486,24 @@ describe Chef::Resource::YumPackage, :requires_root, external: exclude_test do
         expect(yum_package.updated_by_last_action?).to be false
         expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
       end
+
+      it "is idempotent when the package is already installed and there is a version string" do
+        preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        yum_package.version "1.2-1"
+        yum_package.package_name("#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        yum_package.run_action(:install)
+        expect(yum_package.updated_by_last_action?).to be false
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+      end
+
+      it "is idempotent when the package is already installed and there is a version string with arch" do
+        preinstall("chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        yum_package.version "1.2-1.#{pkg_arch}"
+        yum_package.package_name("#{CHEF_SPEC_ASSETS}/yumrepo/chef_rpm-1.2-1.#{pkg_arch}.rpm")
+        yum_package.run_action(:install)
+        expect(yum_package.updated_by_last_action?).to be false
+        expect(shell_out("rpm -q --queryformat '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n' chef_rpm").stdout.chomp).to match("^chef_rpm-1.2-1.#{pkg_arch}$")
+      end
     end
 
     context "with no available version" do

data/spec/functional/run_lock_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2012-2020, Chef Software Inc.
+# Copyright:: Copyright 2012-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -334,7 +334,6 @@ describe Chef::RunLock do
       loop do
         line = readline_nonblock(read_from_process)
         break if line.nil?
-
         event, time = line.split("@")
         example.log_event("#{name}.last_event got #{event}")
         example.log_event("[#{name}] #{event}", time.strip)
@@ -347,7 +346,7 @@ describe Chef::RunLock do
       example.log_event("#{name}.run_to(#{to_event.inspect})")
 
       # Start the process if it's not started
-      start unless pid
+      start if !pid
 
       # Tell the process what to stop at (also means it can go)
       write_to_process.print "#{to_event}\n"
@@ -371,7 +370,7 @@ describe Chef::RunLock do
     def run_to_completion
       example.log_event("#{name}.run_to_completion")
       # Start the process if it's not started
-      start unless pid
+      start if !pid
 
       # Tell the process to stop at nothing (no blocking)
       @write_to_process.print "nothing\n"
@@ -404,12 +403,6 @@ describe Chef::RunLock do
           example.log_event("#{name}.stop finished (pid #{pid} wasn't running)")
         end
       end
-
-      # close the IO.pipes so we don't leak them as open filehandles
-      @read_from_process.close rescue nil
-      @write_to_tests.close rescue nil
-      @read_from_tests.close rescue nil
-      @write_to_process.close rescue nil
     end
 
     def fire_event(event)

data/spec/functional/shell_spec.rb

@@ -82,8 +82,7 @@ describe Shell do
 
       require "pty"
       config = File.expand_path("shef-config.rb", CHEF_SPEC_DATA)
-      path_to_chef_shell = File.expand_path("../../../bin/chef-shell", __FILE__)
-      reader, writer, pid = PTY.spawn("#{path_to_chef_shell} -c #{config} #{options}")
+      reader, writer, pid = PTY.spawn("bundle exec chef-shell -c #{config} #{options}")
       read_until(reader, "chef (#{Chef::VERSION})>")
       yield reader, writer if block_given?
       writer.puts('"done"')