chef 14.14.29-universal-mingw32 → 14.15.6-universal-mingw32

data/spec/functional/knife/exec_spec.rb

@@ -49,7 +49,7 @@ describe Chef::Knife::Exec do
     code = "$output.puts nodes.all"
     @knife.config[:exec] = code
     @knife.run
-    expect($output.string).to match(%r{node\[ohai-world\]})
+    expect($output.string).to match(/node\[ohai-world\]/)
   end
 
 end

data/spec/functional/knife/ssh_spec.rb

@@ -31,7 +31,7 @@ describe Chef::Knife::Ssh do
     @server.stop
   end
 
-  let(:ssh_config) { Hash.new }
+  let(:ssh_config) { {} }
   before do
     allow(Net::SSH).to receive(:configuration_for).and_return(ssh_config)
   end
@@ -301,7 +301,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV["HOME"]}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end
@@ -315,7 +315,7 @@ describe Chef::Knife::Ssh do
       end
 
       it "uses the ssh_gateway_identity file" do
-        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { keys: File.expand_path("#{ENV["HOME"]}/.ssh/aws-gateway.rsa").squeeze("/"), keys_only: true })
         @knife.run
         expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
       end

data/spec/functional/mixin/user_context_spec.rb

@@ -26,7 +26,7 @@ describe Chef::Mixin::UserContext, windows_only: true do
 
   let(:get_user_name_a) do
     FFI.ffi_lib "advapi32.dll"
-    FFI.attach_function :GetUserNameA, [ :pointer, :pointer ], :bool
+    FFI.attach_function :GetUserNameA, %i{pointer pointer}, :bool
   end
 
   let(:process_username) do
@@ -36,12 +36,14 @@ describe Chef::Mixin::UserContext, windows_only: true do
     if succeeded || last_error != Chef::ReservedNames::Win32::API::Error::ERROR_INSUFFICIENT_BUFFER
       raise Chef::Exceptions::Win32APIError, "Expected ERROR_INSUFFICIENT_BUFFER from GetUserNameA but it returned the following error: #{last_error}"
     end
+
     user_name = FFI::MemoryPointer.new :char, (name_size.read_long)
     succeeded = get_user_name_a.call(user_name, name_size)
     last_error = FFI::LastError.error
     if succeeded == 0 || last_error != 0
       raise Chef::Exceptions::Win32APIError, "GetUserNameA failed with #{lasterror}"
     end
+
     user_name.read_string
   end
 

data/spec/functional/rebooter_spec.rb

@@ -44,7 +44,7 @@ describe Chef::Platform::Rebooter do
 
   let(:expected) do
     {
-      windows: "#{ENV['SYSTEMROOT']}/System32/shutdown.exe /r /t 300 /c \"rebooter spec test\"",
+      windows: "#{ENV["SYSTEMROOT"]}/System32/shutdown.exe /r /t 300 /c \"rebooter spec test\"",
       linux: 'shutdown -r +5 "rebooter spec test" &',
       solaris: 'shutdown -i6 -g5 -y "rebooter spec test" &',
     }

data/spec/functional/resource/aix_service_spec.rb

@@ -77,7 +77,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
   include Chef::Mixin::ShellOut
 
   def get_user_id
-    shell_out("id -u #{ENV['USER']}").stdout.chomp
+    shell_out("id -u #{ENV["USER"]}").stdout.chomp
   end
 
   describe "When service is a subsystem" do

data/spec/functional/resource/aixinit_service_spec.rb

@@ -40,7 +40,7 @@ describe Chef::Resource::Service, :requires_root, :aix_only do
     directory = []
     if priority.is_a? Hash
       priority.each do |level, o|
-        directory << "/etc/rc.d/rc#{level}.d/#{(o[0] == :start ? 'S' : 'K')}#{o[1]}#{new_resource.service_name}"
+        directory << "/etc/rc.d/rc#{level}.d/#{(o[0] == :start ? "S" : "K")}#{o[1]}#{new_resource.service_name}"
       end
       directory
     else

data/spec/functional/resource/apt_package_spec.rb

@@ -89,7 +89,7 @@ end
 metadata = { unix_only: true,
              requires_root: true,
              provider: { package: Chef::Provider::Package::Apt },
-             arch: "x86_64" # test packages are 64bit
+             arch: "x86_64", # test packages are 64bit
 }
 
 describe Chef::Resource::AptPackage, metadata do

data/spec/functional/resource/chocolatey_package_spec.rb

@@ -22,7 +22,7 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
   include Chef::Mixin::PowershellOut
 
   let(:package_name) { "test-A" }
-  let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(' ')}").stdout.chomp } }
+  let(:package_list) { proc { powershell_out!("choco list -lo -r #{Array(package_name).join(" ")}").stdout.chomp } }
   let(:package_source) { File.join(CHEF_SPEC_ASSETS, "chocolatey_feed") }
 
   subject do
@@ -63,7 +63,7 @@ describe Chef::Resource::ChocolateyPackage, :windows_only, :choco_installed do
     end
 
     context "installing multiple packages" do
-      let(:package_name) { [ "test-A", "test-B" ] }
+      let(:package_name) { %w{test-A test-B} }
 
       it "installs both packages" do
         subject.run_action(:install)

data/spec/functional/resource/cookbook_file_spec.rb

@@ -25,9 +25,7 @@ describe Chef::Resource::CookbookFile do
   let(:source) { "java.response" }
   let(:cookbook_name) { "java" }
   let(:expected_content) do
-    content = File.open(File.join(CHEF_SPEC_DATA, "cookbooks", "java", "files", "default", "java.response"), "rb") do |f|
-      f.read
-    end
+    content = File.open(File.join(CHEF_SPEC_DATA, "cookbooks", "java", "files", "default", "java.response"), "rb", &:read)
     content.force_encoding(Encoding::BINARY) if content.respond_to?(:force_encoding)
     content
   end

data/spec/functional/resource/cron_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
   # Platform specific validation routines.
   def cron_should_exists(cron_name, command)
     case ohai[:platform]
-    when "aix", "solaris", "opensolaris", "solaris2", "omnios"
+    when "aix", "opensolaris", "solaris2", "omnios"
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(0)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").stdout.lines.to_a.size).to eq(1)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{command}\"").exitstatus).to eq(0)
@@ -43,7 +43,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
 
   def cron_should_not_exists(cron_name)
     case ohai[:platform]
-    when "aix", "solaris", "opensolaris", "solaris2", "omnios"
+    when "aix", "opensolaris", "solaris2", "omnios"
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{cron_name}\"").exitstatus).to eq(1)
       expect(shell_out("crontab -l #{new_resource.user} | grep \"#{new_resource.command}\"").stdout.lines.to_a.size).to eq(0)
     else
@@ -57,7 +57,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
     new_resource = Chef::Resource::Cron.new("Chef functional test cron", run_context)
     new_resource.user  "root"
     # @hourly is not supported on solaris, aix
-    if ohai[:platform] == "solaris" || ohai[:platform] == "solaris2" || ohai[:platform] == "aix"
+    if ohai[:platform] == "solaris2" || ohai[:platform] == "aix"
       new_resource.minute "0 * * * *"
     else
       new_resource.minute "@hourly"
@@ -118,6 +118,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
 
     def cron_attribute_should_exists(cron_name, attribute, value)
       return if %w{aix solaris}.include?(ohai[:platform])
+
       # Test if the attribute exists on newly created cron
       cron_should_exists(cron_name, "")
       expect(shell_out("crontab -l -u #{new_resource.user} | grep '#{attribute.upcase}=\"#{value}\"'").exitstatus).to eq(0)

data/spec/functional/resource/dpkg_package_spec.rb

@@ -273,7 +273,7 @@ describe Chef::Resource::DpkgPackage, :requires_root, :debian_family_only, arch:
 
     it "should remove both packages when called with two" do
       shell_out!("dpkg -i #{test1_0} #{test2_0}")
-      set_dpkg_package_name [ "chef-integration-test", "chef-integration-test2" ]
+      set_dpkg_package_name %w{chef-integration-test chef-integration-test2}
       dpkg_package.run_action(action)
       expect(dpkg_package).to be_updated_by_last_action
       should_be_purged_or_removed("chef-integration-test")
@@ -282,7 +282,7 @@ describe Chef::Resource::DpkgPackage, :requires_root, :debian_family_only, arch:
 
     it "should remove a package when only the first one is installed" do
       shell_out!("dpkg -i #{test1_0}")
-      set_dpkg_package_name [ "chef-integration-test", "chef-integration-test2" ]
+      set_dpkg_package_name %w{chef-integration-test chef-integration-test2}
       dpkg_package.run_action(action)
       expect(dpkg_package).to be_updated_by_last_action
       should_be_purged_or_removed("chef-integration-test")
@@ -291,7 +291,7 @@ describe Chef::Resource::DpkgPackage, :requires_root, :debian_family_only, arch:
 
     it "should remove a package when only the second one is installed" do
       shell_out!("dpkg -i #{test2_0}")
-      set_dpkg_package_name [ "chef-integration-test", "chef-integration-test2" ]
+      set_dpkg_package_name %w{chef-integration-test chef-integration-test2}
       dpkg_package.run_action(action)
       expect(dpkg_package).to be_updated_by_last_action
       should_be_purged_or_removed("chef-integration-test")
@@ -299,7 +299,7 @@ describe Chef::Resource::DpkgPackage, :requires_root, :debian_family_only, arch:
     end
 
     it "should do nothing when both packages are not installed" do
-      set_dpkg_package_name [ "chef-integration-test", "chef-integration-test2" ]
+      set_dpkg_package_name %w{chef-integration-test chef-integration-test2}
       dpkg_package.run_action(action)
       expect(dpkg_package).not_to be_updated_by_last_action
       should_be_purged_or_removed("chef-integration-test")

data/spec/functional/resource/dsc_resource_spec.rb

@@ -46,7 +46,8 @@ describe Chef::Resource::DscResource, :windows_powershell_dsc_only do
       it "raises an exception if the resource is not found" do
         new_resource.resource "thisdoesnotexist"
         expect { new_resource.run_action(:run) }.to raise_error(
-                                            Chef::Exceptions::ResourceNotFound)
+          Chef::Exceptions::ResourceNotFound
+        )
       end
     end
 

data/spec/functional/resource/dsc_script_spec.rb

@@ -103,7 +103,7 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
      ValueData = '#{test_registry_data}'
      Ensure = 'Present'
   }
-EOH
+    EOH
   end
 
   let(:dsc_code) { dsc_reg_code }
@@ -111,7 +111,7 @@ EOH
     <<-EOH
   param($testregkeyname, $testregvaluename)
   #{dsc_reg_code}
-EOH
+    EOH
   end
 
   let(:dsc_user_prefix) { "dsc" }
@@ -138,7 +138,7 @@ EOH
     $#{dsc_user_prefix_param_name},
     $#{dsc_user_suffix_param_name}
     )
-EOH
+    EOH
   end
 
   let(:config_param_section) { "" }
@@ -166,7 +166,7 @@ EOH
           PasswordChangeRequired = $false
       }
       }
-EOH
+    EOH
   end
 
   let(:dsc_user_config_data) do
@@ -180,12 +180,12 @@ EOH
           )
       }
 
-EOH
+    EOH
   end
 
   let(:dsc_environment_env_var_name) { "dsc_test_cwd" }
-  let(:dsc_environment_no_fail_not_etc_directory) { "#{ENV['systemroot']}\\system32" }
-  let(:dsc_environment_fail_etc_directory) { "#{ENV['systemroot']}\\system32\\drivers\\etc" }
+  let(:dsc_environment_no_fail_not_etc_directory) { "#{ENV["systemroot"]}\\system32" }
+  let(:dsc_environment_fail_etc_directory) { "#{ENV["systemroot"]}\\system32\\drivers\\etc" }
   let(:exception_message_signature) { "LL927-LL928" }
   let(:dsc_environment_config) do
     <<~EOH
@@ -199,7 +199,7 @@ EOH
           Value = $pwd.path
           Ensure = 'Present'
       }
-EOH
+    EOH
   end
 
   let(:dsc_config_name) do
@@ -249,7 +249,7 @@ EOH
            Name = '#{dsc_environment_env_var_name}'
            Ensure = 'Absent'
         }
-EOH
+      EOH
       removal_resource.run_action(:run)
     end
 
@@ -310,7 +310,7 @@ EOH
 
       it "should set a registry key according to parameters passed to the configuration" do
         dsc_test_resource.configuration_name(config_name_value)
-        dsc_test_resource.flags({ :"#{reg_key_name_param_name}" => test_registry_key, :"#{reg_key_value_param_name}" => test_registry_value })
+        dsc_test_resource.flags({ "#{reg_key_name_param_name}": test_registry_key, "#{reg_key_value_param_name}": test_registry_value })
         expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(false)
         dsc_test_resource.run_action(:run)
         expect(dsc_test_resource.registry_key_exists?(test_registry_key)).to eq(true)
@@ -347,11 +347,9 @@ EOH
   shared_examples_for "a dsc_script with configuration data that takes parameters" do
     let(:dsc_user_code) { dsc_user_param_code }
     let(:config_param_section) { config_params }
-    let(:config_flags) { { :"#{dsc_user_prefix_param_name}" => (dsc_user_prefix).to_s, :"#{dsc_user_suffix_param_name}" => (dsc_user_suffix).to_s } }
+    let(:config_flags) { { "#{dsc_user_prefix_param_name}": (dsc_user_prefix).to_s, "#{dsc_user_suffix_param_name}": (dsc_user_suffix).to_s } }
     it "does not directly contain the user name" do
-      configuration_script_content = ::File.open(dsc_test_resource.command) do |file|
-        file.read
-      end
+      configuration_script_content = ::File.open(dsc_test_resource.command, &:read)
       expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
     it_behaves_like "a dsc_script with configuration data"
@@ -361,9 +359,7 @@ EOH
     let(:dsc_user_code) { dsc_user_env_code }
 
     it "does not directly contain the user name" do
-      configuration_script_content = ::File.open(dsc_test_resource.command) do |file|
-        file.read
-      end
+      configuration_script_content = ::File.open(dsc_test_resource.command, &:read)
       expect(configuration_script_content.include?(dsc_user)).to be(false)
     end
     it_behaves_like "a dsc_script with configuration data"
@@ -448,7 +444,7 @@ EOH
         }
         "@
         $ConfigurationData | out-file '#{configuration_data_path}' -force
-  MYCODE
+      MYCODE
     end
 
     let(:powershell_script_resource) do
@@ -464,10 +460,10 @@ EOH
           User dsctestusercreate
           {
               UserName = '#{dsc_user}'
-              Password = #{r.ps_credential('jf9a8m49jrajf4#')}
+              Password = #{r.ps_credential("jf9a8m49jrajf4#")}
               Ensure = "Present"
           }
-EOF
+        EOF
         r.configuration_data_script(configuration_data_path)
       end
     end

data/spec/functional/resource/execute_spec.rb

@@ -87,8 +87,8 @@ describe Chef::Resource::Execute do
   describe "when parent resource sets :environment" do
     before do
       resource.environment({
-        "SAWS_SECRET"  => "supersecret",
-        "SAWS_KEY"     => "qwerty",
+        "SAWS_SECRET" => "supersecret",
+        "SAWS_KEY" => "qwerty",
       })
     end
 

data/spec/functional/resource/git_spec.rb

@@ -69,7 +69,7 @@ describe Chef::Resource::Git, requires_git: true do
       [user]
         name = frodoTbaggins
         email = frodo@shire.org
-E
+    E
   end
 
   before(:each) do
@@ -220,7 +220,7 @@ E
   context "when dealing with a repo with a degenerate tag named 'HEAD'" do
     before do
       shell_out!("git tag -m\"degenerate tag\" HEAD ed181b3419b6f489bedab282348162a110d6d3a1",
-                 cwd: origin_repo)
+        cwd: origin_repo)
     end
 
     let(:basic_git_resource) do
@@ -240,16 +240,16 @@ E
     it "checks out the (master) HEAD revision and ignores the tag" do
       basic_git_resource.run_action(:sync)
       head_rev = shell_out!("git rev-parse HEAD",
-                            cwd: deploy_directory,
-                            returns: [0]).stdout.strip
+        cwd: deploy_directory,
+        returns: [0]).stdout.strip
       expect(head_rev).to eq(rev_head)
     end
 
     it "checks out the (master) HEAD revision when no revision is specified (ignores tag)" do
       git_resource_default_rev.run_action(:sync)
       head_rev = shell_out!("git rev-parse HEAD",
-                            cwd: deploy_directory,
-                            returns: [0]).stdout.strip
+        cwd: deploy_directory,
+        returns: [0]).stdout.strip
       expect(head_rev).to eq(rev_head)
     end
 

data/spec/functional/resource/group_spec.rb

@@ -96,7 +96,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
   end
 
   def create_user(username, uid = nil)
-    if ! windows_domain_user?(username)
+    unless windows_domain_user?(username)
       user_to_create = user(username)
       user_to_create.uid(uid) if uid
       user_to_create.run_action(:create)
@@ -105,7 +105,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
   end
 
   def remove_user(username)
-    if ! windows_domain_user?(username)
+    unless windows_domain_user?(username)
       u = user(username)
       u.manage_home false # jekins hosts throw mail spool file not owned by user if we use manage_home true
       u.run_action(:remove)
@@ -152,7 +152,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
         let(:excluded_members) { [] }
 
         it "should raise an error" do
-          expect { group_resource.run_action(tested_action) }.to raise_error()
+          expect { group_resource.run_action(tested_action) }.to raise_error
         end
       end
 
@@ -162,7 +162,7 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
         end
 
         it "should raise an error" do
-          expect { group_resource.run_action(tested_action) }.to raise_error()
+          expect { group_resource.run_action(tested_action) }.to raise_error
         end
       end
     end
@@ -336,7 +336,8 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
         "theoldmanwalkingdownthestreetalwayshadagood\
 smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\
 theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\
-downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestree" end
+downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestree"
+      end
 
       it "should create a group" do
         group_resource.run_action(:create)
@@ -362,7 +363,8 @@ downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestree" end
       "theoldmanwalkingdownthestreetalwayshadagood\
 smileonhisfacetheoldmanwalkingdownthestreetalwayshadagoodsmileonhisface\
 theoldmanwalkingdownthestreetalwayshadagoodsmileonhisfacetheoldmanwalking\
-downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ" end
+downthestreetalwayshadagoodsmileonhisfacetheoldmanwalkingdownthestreeQQQQQQ"
+    end
 
     it "should not create a group" do
       expect { group_resource.run_action(:create) }.to raise_error(ArgumentError)

data/spec/functional/resource/ifconfig_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2020, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,9 +23,7 @@ require "chef/mixin/shell_out"
 # run this test only for following platforms.
 include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai[:platform_family] == "rhel" && ohai[:platform_version].to_i < 7))
 
-describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, external: include_flag do
-  # This test does not work in travis because there is no eth0
-
+describe Chef::Resource::Ifconfig, :requires_root, :requires_ifconfig, external: include_flag do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do
@@ -53,7 +51,7 @@ describe Chef::Resource::Ifconfig, :requires_root, :skip_travis, external: inclu
   end
 
   def fetch_first_interface_name
-    shell_out("ip link list |grep UP|grep -vi loop|head -1|cut -d':' -f 2").stdout.strip
+    shell_out("ip link list |grep UP|grep -vi loop|head -1|cut -d':' -f 2 |cut -d'@' -f 1").stdout.strip
   end
 
   # **Caution: any updates to core interfaces can be risky.