chef 16.2.44-universal-mingw32 → 16.4.35-universal-mingw32

data/spec/functional/resource/git_spec.rb

@@ -20,7 +20,7 @@ require "spec_helper"
 require "tmpdir"
 
 # Deploy relies heavily on symlinks, so it doesn't work on windows.
-describe Chef::Resource::Git, requires_git: true do
+describe Chef::Resource::Git do
   include RecipeDSLHelper
 
   # Some versions of git complains when the deploy directory is
@@ -239,6 +239,28 @@ describe Chef::Resource::Git, requires_git: true do
     end
   end
 
+  context "when updating a branch that's already checked out out" do
+    it "checks out master, commits to the repo, and checks out the latest changes" do
+      git deploy_directory do
+        repository origin_repo
+        revision "master"
+        action :sync
+      end.should_be_updated
+
+      # We don't have a way to test a commit in the git bundle
+      # Revert to a previous commit in the same branch and make sure we can still sync.
+      shell_out!("git", "reset", "--hard", rev_foo, cwd: deploy_directory)
+
+      git deploy_directory do
+        repository origin_repo
+        revision "master"
+        action :sync
+      end.should_be_updated
+      expect_revision_to_be("HEAD", rev_head)
+      expect_branch_to_be("master")
+    end
+  end
+
   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)

data/spec/functional/resource/group_spec.rb

@@ -18,7 +18,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 describe Chef::Resource::Group, :requires_root_or_running_windows do
@@ -113,6 +112,15 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
     # TODO: User shouldn't exist
   end
 
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
   shared_examples_for "correct group management" do
     def add_members_to_group(members)
       temp_resource = group_resource.dup
@@ -151,8 +159,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
         # excluded_members can only be used when append is set.  It is ignored otherwise.
         let(:excluded_members) { [] }
 
+        let(:expected_error_class) { windows? ? ArgumentError : Mixlib::ShellOut::ShellCommandFailed }
+
         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(expected_error_class)
         end
       end
 
@@ -161,8 +171,10 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
           group_resource.append(true)
         end
 
+        let(:expected_error_class) { windows? ? Chef::Exceptions::Win32APIError : Mixlib::ShellOut::ShellCommandFailed }
+
         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(expected_error_class)
         end
       end
     end
@@ -295,12 +307,12 @@ describe Chef::Resource::Group, :requires_root_or_running_windows do
   let(:number) do
     # Loop until we pick a gid that is not in use.
     loop do
-      begin
-        gid = rand(2000..9999) # avoid low group numbers
-        return nil if Etc.getgrgid(gid).nil? # returns nil on windows
-      rescue ArgumentError # group does not exist
-        return gid
-      end
+
+      gid = rand(2000..9999) # avoid low group numbers
+      return nil if Etc.getgrgid(gid).nil? # returns nil on windows
+    rescue ArgumentError # group does not exist
+      return gid
+
     end
   end
 

data/spec/functional/resource/ifconfig_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
@@ -26,6 +25,15 @@ include_flag = !(%w{amazon debian aix}.include?(ohai[:platform_family]) || (ohai
 describe Chef::Resource::Ifconfig, :requires_root, :requires_ifconfig, external: include_flag do
   include Chef::Mixin::ShellOut
 
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
   let(:new_resource) do
     new_resource = Chef::Resource::Ifconfig.new("10.10.0.1", run_context)
     new_resource

data/spec/functional/resource/insserv_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 #
 # Author:: Dheeraj Dubey (<dheeraj.dubey@msystechnologies.com>)
 # Copyright:: Copyright (c) Chef Software Inc.
@@ -18,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 require "fileutils"
 
@@ -40,11 +38,11 @@ describe Chef::Resource::Service, :requires_root, :opensuse do
   # Platform specific validation routines.
   def service_should_be_started(file_name)
     # The existence of this file indicates that the service was started.
-    expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_truthy
+    expect(File.exist?("#{Dir.tmpdir}/#{file_name}")).to be_truthy
   end
 
   def service_should_be_stopped(file_name)
-    expect(File.exists?("#{Dir.tmpdir}/#{file_name}")).to be_falsey
+    expect(File.exist?("#{Dir.tmpdir}/#{file_name}")).to be_falsey
   end
 
   def delete_test_files
@@ -54,6 +52,8 @@ describe Chef::Resource::Service, :requires_root, :opensuse do
 
   # Actual tests
   let(:new_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
+
     new_resource = Chef::Resource::Service.new("inittest", run_context)
     new_resource.provider Chef::Provider::Service::Insserv
     new_resource.supports({ status: true, restart: true, reload: true })
@@ -65,7 +65,7 @@ describe Chef::Resource::Service, :requires_root, :opensuse do
     provider
   end
 
-  let (:service_name) { "Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)" }
+  let(:service_name) { "Chef::Util::PathHelper.escape_glob_dir(current_resource.service_name)" }
 
   let(:current_resource) do
     provider.load_current_resource
@@ -73,13 +73,13 @@ describe Chef::Resource::Service, :requires_root, :opensuse do
   end
 
   before(:all) do
-    File.delete("/etc/init.d/inittest") if File.exists?("/etc/init.d/inittest")
+    File.delete("/etc/init.d/inittest") if File.exist?("/etc/init.d/inittest")
     FileUtils.cp((File.join(File.dirname(__FILE__), "/../assets/inittest")).to_s, "/etc/init.d/inittest")
     FileUtils.chmod(0755, "/etc/init.d/inittest")
   end
 
   after(:all) do
-    File.delete("/etc/init.d/inittest") if File.exists?("/etc/init.d/inittest")
+    File.delete("/etc/init.d/inittest") if File.exist?("/etc/init.d/inittest")
   end
 
   before(:each) do

data/spec/functional/resource/link_spec.rb

@@ -55,22 +55,19 @@ describe Chef::Resource::Link do
   end
 
   after(:each) do
-    begin
-      cleanup_link(to) if File.exists?(to)
-      cleanup_link(target_file) if File.exists?(target_file)
-      cleanup_link(CHEF_SPEC_BACKUP_PATH) if File.exists?(CHEF_SPEC_BACKUP_PATH)
-    rescue
-      puts "Could not remove a file: #{$!}"
-    end
-  end
 
-  def node
-    node = Chef::Node.new
-    node.consume_external_attrs(ohai.data, {})
-    node
+    cleanup_link(to) if File.exist?(to)
+    cleanup_link(target_file) if File.exist?(target_file)
+    cleanup_link(CHEF_SPEC_BACKUP_PATH) if File.exist?(CHEF_SPEC_BACKUP_PATH)
+  rescue
+    puts "Could not remove a file: #{$!}"
+
   end
 
   def user(user)
+    node = Chef::Node.new
+    node.consume_external_attrs(ohai.data, {})
+    run_context = Chef::RunContext.new(node, {}, Chef::EventDispatch::Dispatcher.new)
     usr = Chef::Resource.resource_for_node(:user, node).new(user, run_context)
     usr.password("ComplexPass11!") if windows?
     usr
@@ -276,7 +273,7 @@ describe Chef::Resource::Link do
           resource.run_action(:create)
         end
         it "preserves the hard link" do
-          expect(File.exists?(target_file)).to be_truthy
+          expect(File.exist?(target_file)).to be_truthy
           expect(symlink?(target_file)).to be_falsey
           # Writing to one hardlinked file should cause both
           # to have the new value.
@@ -301,7 +298,7 @@ describe Chef::Resource::Link do
           resource.run_action(:create)
         end
         it "links to the target file" do
-          expect(File.exists?(target_file)).to be_truthy
+          expect(File.exist?(target_file)).to be_truthy
           expect(symlink?(target_file)).to be_falsey
           # Writing to one hardlinked file should cause both
           # to have the new value.
@@ -341,7 +338,7 @@ describe Chef::Resource::Link do
             include_context "delete succeeds"
             it "the :delete action does not delete the target file" do
               resource.run_action(:delete)
-              expect(File.exists?(to)).to be_truthy
+              expect(File.exist?(to)).to be_truthy
             end
           end
           context "pointing somewhere else", :requires_root_or_running_windows do
@@ -369,7 +366,7 @@ describe Chef::Resource::Link do
             include_context "delete succeeds"
             it "the :delete action does not delete the target file" do
               resource.run_action(:delete)
-              expect(File.exists?(to)).to be_truthy
+              expect(File.exist?(to)).to be_truthy
             end
           end
           context "pointing nowhere" do
@@ -386,7 +383,7 @@ describe Chef::Resource::Link do
         context "and the link already exists and is a hard link to the file" do
           before(:each) do
             link(to, target_file)
-            expect(File.exists?(target_file)).to be_truthy
+            expect(File.exist?(target_file)).to be_truthy
             expect(symlink?(target_file)).to be_falsey
           end
           include_context "create symbolic link succeeds"
@@ -406,7 +403,7 @@ describe Chef::Resource::Link do
           it "create errors out" do
             if windows?
               expect { resource.run_action(:create) }.to raise_error(Errno::EACCES)
-            elsif os_x? || solaris? || freebsd? || aix?
+            elsif macos? || solaris? || freebsd? || aix?
               expect { resource.run_action(:create) }.to raise_error(Errno::EPERM)
             else
               expect { resource.run_action(:create) }.to raise_error(Errno::EISDIR)
@@ -585,14 +582,14 @@ describe Chef::Resource::Link do
         context "and the link already exists and is a hard link to the file" do
           before(:each) do
             link(to, target_file)
-            expect(File.exists?(target_file)).to be_truthy
+            expect(File.exist?(target_file)).to be_truthy
             expect(symlink?(target_file)).to be_falsey
           end
           include_context "create hard link is noop"
           include_context "delete succeeds"
           it "the :delete action does not delete the target file" do
             resource.run_action(:delete)
-            expect(File.exists?(to)).to be_truthy
+            expect(File.exist?(to)).to be_truthy
           end
         end
         context "and the link already exists and is a file" do
@@ -609,7 +606,7 @@ describe Chef::Resource::Link do
           it "errors out" do
             if windows?
               expect { resource.run_action(:create) }.to raise_error(Errno::EACCES)
-            elsif os_x? || solaris? || freebsd? || aix?
+            elsif macos? || solaris? || freebsd? || aix?
               expect { resource.run_action(:create) }.to raise_error(Errno::EPERM)
             else
               expect { resource.run_action(:create) }.to raise_error(Errno::EISDIR)
@@ -656,9 +653,9 @@ describe Chef::Resource::Link do
           end
           context "and the link does not yet exist" do
             it "links to the target file" do
-              skip("macOS/FreeBSD/AIX/Solaris symlink? and readlink working on hard links to symlinks") if os_x? || freebsd? || aix? || solaris?
+              skip("macOS/FreeBSD/AIX/Solaris symlink? and readlink working on hard links to symlinks") if macos? || freebsd? || aix? || solaris?
               resource.run_action(:create)
-              expect(File.exists?(target_file)).to be_truthy
+              expect(File.exist?(target_file)).to be_truthy
               # macOS gets angry about this sort of link. Bug in macOS, IMO.
               expect(symlink?(target_file)).to be_truthy
               expect(readlink(target_file)).to eq(canonicalize(@other_target))
@@ -675,9 +672,9 @@ describe Chef::Resource::Link do
           end
           context "and the link does not yet exist" do
             it "links to the target file" do
-              skip("macOS/FreeBSD/AIX/Solaris fails to create hardlinks to broken symlinks") if os_x? || freebsd? || aix? || solaris?
+              skip("macOS/FreeBSD/AIX/Solaris fails to create hardlinks to broken symlinks") if macos? || freebsd? || aix? || solaris?
               resource.run_action(:create)
-              expect(File.exists?(target_file) || File.symlink?(target_file)).to be_truthy
+              expect(File.exist?(target_file) || File.symlink?(target_file)).to be_truthy
               expect(symlink?(target_file)).to be_truthy
               expect(readlink(target_file)).to eq(canonicalize(@other_target))
             end

data/spec/functional/resource/mount_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 require "tmpdir"
 
@@ -101,6 +100,15 @@ describe Chef::Resource::Mount, :requires_root, external: include_flag do
     expect(shell_out("cat #{unix_mount_config_file}").stdout).not_to include("#{mount_point}:")
   end
 
+  let(:run_context) do
+    node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
+    events = Chef::EventDispatch::Dispatcher.new
+    Chef::RunContext.new(node, {}, events)
+  end
+
   let(:new_resource) do
     new_resource = Chef::Resource::Mount.new(@mount_point, run_context)
     new_resource.device      @device

data/spec/functional/resource/msu_package_spec.rb

@@ -26,11 +26,17 @@ describe Chef::Resource::MsuPackage, :win2012r2_only do
   let(:package_identity) { "Package_for_KB2959977~31bf3856ad364e35~amd64~~6.3.1.1" }
   let(:timeout) { 3600 }
 
-  let(:new_resource) { Chef::Resource::CabPackage.new("windows_test_pkg") }
-  let(:cab_provider) do
+  let(:run_context) do
     node = Chef::Node.new
+    node.default[:platform] = ohai[:platform]
+    node.default[:platform_version] = ohai[:platform_version]
+    node.default[:os] = ohai[:os]
     events = Chef::EventDispatch::Dispatcher.new
-    run_context = Chef::RunContext.new(node, {}, events)
+    Chef::RunContext.new(node, {}, events)
+  end
+
+  let(:new_resource) { Chef::Resource::CabPackage.new("windows_test_pkg") }
+  let(:cab_provider) do
     Chef::Provider::Package::Cab.new(new_resource, run_context)
   end
 

data/spec/functional/resource/powershell_script_spec.rb

@@ -23,8 +23,8 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
   include_context Chef::Resource::WindowsScript
 
-  let (:architecture_command) { "echo $env:PROCESSOR_ARCHITECTURE" }
-  let (:output_command) { " | out-file -encoding ASCII " }
+  let(:architecture_command) { "echo $env:PROCESSOR_ARCHITECTURE" }
+  let(:output_command) { " | out-file -encoding ASCII " }
 
   it_behaves_like "a Windows script running on Windows"
 
@@ -68,8 +68,8 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
       end
     end
 
-    let (:negative_exit_status) { -27 }
-    let (:unsigned_exit_status) { (-negative_exit_status ^ 65535) + 1 }
+    let(:negative_exit_status) { -27 }
+    let(:unsigned_exit_status) { (-negative_exit_status ^ 65535) + 1 }
     it "returns the exit status -27 as a signed integer or an unsigned 16-bit 2's complement value of 65509 for a powershell script that exits with -27" do
 
       # Versions of PowerShell prior to 4.0 return a 16-bit unsigned value --
@@ -273,10 +273,10 @@ describe Chef::Resource::WindowsScript::PowershellScript, :windows_only do
 
     context "when running on a 32-bit version of Windows", :windows32_only do
       it "raises an exception if :x86_64 process architecture is specified" do
-        begin
-          expect(resource.architecture(:x86_64)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
-        rescue Chef::Exceptions::Win32ArchitectureIncorrect
-        end
+
+        expect(resource.architecture(:x86_64)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
+      rescue Chef::Exceptions::Win32ArchitectureIncorrect
+
       end
     end
   end

data/spec/functional/resource/remote_file_spec.rb

@@ -229,8 +229,8 @@ describe Chef::Resource::RemoteFile do
           end
 
           context "when the resource is accessed using an alternate user's identity with no access to the file" do
-            let (:windows_nonadmin_user) { "chefremfile1" }
-            let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe1" }
+            let(:windows_nonadmin_user) { "chefremfile1" }
+            let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe1" }
             include_context "a non-admin Windows user"
 
             before do
@@ -246,8 +246,8 @@ describe Chef::Resource::RemoteFile do
         end
 
         context "when the the file is only accessible as a specific alternate identity" do
-          let (:windows_nonadmin_user) { "chefremfile2" }
-          let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe2" }
+          let(:windows_nonadmin_user) { "chefremfile2" }
+          let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe2" }
           include_context "a non-admin Windows user"
 
           before do
@@ -279,8 +279,8 @@ describe Chef::Resource::RemoteFile do
           end
 
           context "when the resource is accessed using an alternate user's identity with no access to the file" do
-            let (:windows_nonadmin_user) { "chefremfile3" }
-            let (:windows_nonadmin_user_password) { "j82ajfxK3;2Xe3" }
+            let(:windows_nonadmin_user) { "chefremfile3" }
+            let(:windows_nonadmin_user_password) { "j82ajfxK3;2Xe3" }
             include_context "a non-admin Windows user"
 
             let(:remote_user) { windows_nonadmin_user_qualified }
@@ -409,13 +409,7 @@ describe Chef::Resource::RemoteFile do
       it "should not create the file" do
         # This can legitimately raise either Errno::EADDRNOTAVAIL or Errno::ECONNREFUSED
         # in different Ruby versions.
-        old_value = RSpec::Expectations.configuration.on_potential_false_positives
-        RSpec::Expectations.configuration.on_potential_false_positives = :nothing
-        begin
-          expect { resource.run_action(:create) }.to raise_error
-        ensure
-          RSpec::Expectations.configuration.on_potential_false_positives = old_value
-        end
+        expect { resource.run_action(:create) }.to raise_error(SystemCallError)
 
         expect(File).not_to exist(path)
       end

data/spec/functional/resource/rpm_spec.rb

@@ -17,7 +17,6 @@
 #
 
 require "spec_helper"
-require "functional/resource/base"
 require "chef/mixin/shell_out"
 
 # run this test only for following platforms.
@@ -26,6 +25,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
   include Chef::Mixin::ShellOut
 
   let(:new_resource) do
+    run_context = Chef::RunContext.new(Chef::Node.new, {}, Chef::EventDispatch::Dispatcher.new)
     new_resource = Chef::Resource::RpmPackage.new(@pkg_name, run_context)
     new_resource.source @pkg_path
     new_resource
@@ -39,7 +39,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
     # mytest rpm package works in centos, redhat and in suse without any dependency issues.
     else
       expect(shell_out("rpm -qa | grep mytest").exitstatus).to eq(0)
-      ::File.exists?("/opt/mytest/mytest.sh") # The mytest rpm package contains the mytest.sh file
+      ::File.exist?("/opt/mytest/mytest.sh") # The mytest rpm package contains the mytest.sh file
     end
   end
 
@@ -48,7 +48,7 @@ describe Chef::Resource::RpmPackage, :requires_root, external: exclude_test do
       expect(shell_out("rpm -qa | grep dummy").exitstatus).to eq(1)
     else
       expect(shell_out("rpm -qa | grep mytest").exitstatus).to eq(1)
-      !::File.exists?("/opt/mytest/mytest.sh")
+      !::File.exist?("/opt/mytest/mytest.sh")
     end
   end