chef 16.3.38-universal-mingw32 → 16.5.64-universal-mingw32

data/spec/unit/knife/core/ui_spec.rb

@@ -510,6 +510,7 @@ describe Chef::Knife::UI do
   describe "color" do
     context "when ui.color? => true" do
       it "returns colored output" do
+        skip "doesn't work on systems that don't correctly have terminals setup for color"
         expect(@ui).to receive(:color?).and_return(true)
         expect(@ui.color("a_bus_is", :yellow)).to eql("\e[33ma_bus_is\e[0m")
       end

data/spec/unit/knife/core/windows_bootstrap_context_spec.rb

@@ -148,24 +148,28 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
 
   describe "#config_content" do
     before do
-      bootstrap_context.instance_variable_set(:@chef_config, Mash.new(config_log_level: :info,
-        config_log_location: STDOUT,
-        chef_server_url: "http://chef.example.com:4444",
-        validation_client_name: "chef-validator-testing",
-        file_cache_path: "c:/chef/cache",
-        file_backup_path: "c:/chef/backup",
-        cache_options: ({ path: "c:/chef/cache/checksums", skip_expires: true })))
+      bootstrap_context.instance_variable_set(
+        :@chef_config, Mash.new(
+          config_log_level: :info,
+          config_log_location: STDOUT,
+          chef_server_url: "http://chef.example.com:4444",
+          validation_client_name: "chef-validator-testing",
+          file_cache_path: "c:/chef/cache",
+          file_backup_path: "c:/chef/backup",
+          cache_options: ({ path: "c:/chef/cache/checksums", skip_expires: true })
+        )
+      )
     end
 
     it "generates the config file data" do
       expected = <<~EXPECTED
         echo.chef_server_url  "http://chef.example.com:4444"
         echo.validation_client_name "chef-validator-testing"
-        echo.file_cache_path   "C:/chef/cache"
-        echo.file_backup_path  "C:/chef/backup"
-        echo.cache_options     ^({:path =^> "C:/chef/cache/checksums", :skip_expires =^> true}^)
+        echo.file_cache_path   "C:\\\\chef\\\\cache"
+        echo.file_backup_path  "C:\\\\chef\\\\backup"
+        echo.cache_options     ^({:path =^> "C:\\\\chef\\\\cache\\\\checksums", :skip_expires =^> true}^)
         echo.# Using default node name ^(fqdn^)
-        echo.log_level :info
+        echo.log_level        :auto
         echo.log_location       STDOUT
       EXPECTED
       expect(bootstrap_context.config_content).to eq expected
@@ -183,7 +187,12 @@ describe Chef::Knife::Core::WindowsBootstrapContext do
 
   describe "#start_chef" do
     it "returns the expected string" do
-      expect(bootstrap_context.start_chef).to match(%r{SET \"PATH=%SystemRoot%\\system32;%SystemRoot%;%SystemRoot%\\System32\\Wbem;%SYSTEMROOT%\\System32\\WindowsPowerShell\\v1.0\\;C:\\ruby\\bin;C:\/opscode\/chef\\bin;C:\/opscode\/chef\\embedded\\bin\;%PATH%\"\n})
+      expect(bootstrap_context.start_chef).to eq(
+        <<~EOH
+          SET "PATH=%SYSTEM32%;%SystemRoot%;%SYSTEM32%\\Wbem;%SYSTEM32%\\WindowsPowerShell\\v1.0\\;C:\\ruby\\bin;C:\\opscode\\chef\\bin;C:\\opscode\\chef\\embedded\\bin;%PATH%"
+          chef-client -c C:\\chef\\client.rb -j C:\\chef\\first-boot.json
+        EOH
+      )
     end
   end
 

data/spec/unit/knife/ssh_spec.rb

@@ -283,10 +283,10 @@ describe Chef::Knife::Ssh do
   end
 
   describe "#ssh_command" do
-    let(:execution_channel) { double(:execution_channel, on_data: nil) }
+    let(:execution_channel) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
     let(:session_channel) { double(:session_channel, request_pty: nil) }
 
-    let(:execution_channel2) { double(:execution_channel, on_data: nil) }
+    let(:execution_channel2) { double(:execution_channel, on_data: nil, on_extended_data: nil) }
     let(:session_channel2) { double(:session_channel, request_pty: nil) }
 
     let(:session) { double(:session, loop: nil) }

data/spec/unit/knife/supermarket_share_spec.rb

@@ -108,7 +108,7 @@ describe Chef::Knife::SupermarketShare do
       expect { @knife.run }.to raise_error(SystemExit)
     end
 
-    if File.exists?("/usr/bin/gnutar") || File.exists?("/bin/gnutar")
+    if File.exist?("/usr/bin/gnutar") || File.exist?("/bin/gnutar")
       it "should use gnutar to make a tarball of the cookbook" do
         expect(@knife).to receive(:shell_out!) do |args|
           expect(args.to_s).to match(/gnutar -czf/)

data/spec/unit/lwrp_spec.rb

@@ -169,7 +169,7 @@ describe "LWRP" do
   describe "Lightweight Chef::Resource" do
 
     before do
-      Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources", "*"))].each do |file|
+      Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources", "*"))].each do |file|
         Chef::Resource::LWRPBase.build_from_file("lwrp", file, nil)
       end
     end
@@ -211,7 +211,7 @@ describe "LWRP" do
       node.normal[:penguin_name] = "jackass"
       run_context = Chef::RunContext.new(node, Chef::CookbookCollection.new, @events)
 
-      Dir[File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
+      Dir[File.expand_path(File.join(__dir__, "..", "data", "lwrp", "resources_with_default_attributes", "*"))].each do |file|
         Chef::Resource::LWRPBase.build_from_file("lwrp", file, run_context)
       end
 
@@ -654,7 +654,7 @@ describe "LWRP" do
     end
 
     let(:run_context) do
-      cookbook_repo = File.expand_path(File.join(File.dirname(__FILE__), "..", "data", "cookbooks"))
+      cookbook_repo = File.expand_path(File.join(__dir__, "..", "data", "cookbooks"))
       cookbook_loader = Chef::CookbookLoader.new(cookbook_repo)
       cookbook_loader.load_cookbooks
       cookbook_collection = Chef::CookbookCollection.new(cookbook_loader)

data/spec/unit/mixin/deep_merge_spec.rb

@@ -236,6 +236,14 @@ describe Chef::Mixin::DeepMerge, "deep_merge!" do
     @dm.deep_merge!(hash_src, hash_dst)
     expect(hash_dst).to eq({ "item" => "orange" })
   end
+
+  it "should overwrite a string with a nil when merging nil values" do
+    hash_src = { "item" => nil }
+    hash_dst = { "item" => "orange" }
+    @dm.deep_merge!(hash_src, hash_dst)
+    expect(hash_dst).to eq({ "item" => nil })
+  end
+
 end # deep_merge!
 
 # Chef specific
@@ -338,5 +346,12 @@ describe Chef::Mixin::DeepMerge do
       merge_with_hash = { "top_level_a" => 2, "top_level_b" => true }
       @dm.hash_only_merge(merge_ee_hash, merge_with_hash)
     end
+
+    it "should overwrite a string with a nil when merging nil values" do
+      hash_src = { "item" => nil }
+      hash_dst = { "item" => "orange" }
+      merged_result = @dm.hash_only_merge(hash_dst, hash_src)
+      expect(merged_result).to eq({ "item" => nil })
+    end
   end
 end

data/spec/unit/mixin/openssl_helper_spec.rb

@@ -99,7 +99,7 @@ describe Chef::Mixin::OpenSSLHelper do
 
     context "When the dhparam.pem file does exist, and does contain a vaild dhparam key" do
       it "returns true" do
-        @dhparam_file.puts(::OpenSSL::PKey::DH.new(1024).to_pem)
+        @dhparam_file.puts(::OpenSSL::PKey::DH.new(256).to_pem) # this is 256 to speed up specs
         @dhparam_file.close
         expect(instance.dhparam_pem_valid?(@dhparam_file.path)).to be_truthy
       end

data/spec/unit/mixin/powershell_exec_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 require "chef/mixin/powershell_exec"
 
-describe Chef::Mixin::PowershellExec, :windows_only do
+describe Chef::Mixin::PowershellExec, :windows_only, :windows_gte_10 do
   let(:powershell_mixin) { Class.new { include Chef::Mixin::PowershellExec } }
   subject(:object) { powershell_mixin.new }
 

data/spec/unit/mixin/securable_spec.rb

@@ -45,7 +45,7 @@ describe Chef::Mixin::Securable do
   describe "unix-specific behavior" do
     before(:each) do
       platform_mock :unix do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
+        load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         @securable = Object.new
         @securable.send(:extend, Chef::Mixin::Securable)
         @securable.send(:extend, Chef::Mixin::ParamsValidate)
@@ -176,7 +176,7 @@ describe Chef::Mixin::Securable do
   describe "windows-specific behavior" do
     before(:each) do
       platform_mock :windows do
-        load File.join(File.dirname(__FILE__), "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
+        load File.join(__dir__, "..", "..", "..", "lib", "chef", "mixin", "securable.rb")
         securable_class = Class.new do
           include Chef::Mixin::Securable
           include Chef::Mixin::ParamsValidate

data/spec/unit/mixin/template_spec.rb

@@ -104,16 +104,16 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should render local files" do
-      begin
-        tf = Tempfile.new("partial")
-        tf.write "test"
-        tf.rewind
-
-        output = @template_context.render_template_from_string("before {<%= render '#{tf.path}', :local => true %>} after")
-        expect(output).to eq("before {test} after")
-      ensure
-        tf.close
-      end
+
+      tf = Tempfile.new("partial")
+      tf.write "test"
+      tf.rewind
+
+      output = @template_context.render_template_from_string("before {<%= render '#{tf.path}', :local => true %>} after")
+      expect(output).to eq("before {test} after")
+    ensure
+      tf.close
+
     end
 
     it "should render partials from a different cookbook" do
@@ -124,16 +124,16 @@ describe Chef::Mixin::Template, "render_template" do
     end
 
     it "should render using the source argument if provided" do
-      begin
-        tf = Tempfile.new("partial")
-        tf.write "test"
-        tf.rewind
-
-        output = @template_context.render_template_from_string("before {<%= render 'something', :local => true, :source => '#{tf.path}' %>} after")
-        expect(output).to eq("before {test} after")
-      ensure
-        tf.close
-      end
+
+      tf = Tempfile.new("partial")
+      tf.write "test"
+      tf.rewind
+
+      output = @template_context.render_template_from_string("before {<%= render 'something', :local => true, :source => '#{tf.path}' %>} after")
+      expect(output).to eq("before {test} after")
+    ensure
+      tf.close
+
     end
 
     it "should pass the node to partials" do
@@ -195,11 +195,11 @@ describe Chef::Mixin::Template, "render_template" do
 
       describe "the raised TemplateError" do
         subject(:exception) do
-          begin
-            do_raise
-          rescue Chef::Mixin::Template::TemplateError => e
-            e
-          end
+
+          do_raise
+        rescue Chef::Mixin::Template::TemplateError => e
+          e
+
         end
 
         it "should contain template file and line numbers" do
@@ -274,11 +274,11 @@ describe Chef::Mixin::Template, "render_template" do
 
     describe "the raised TemplateError" do
       before :each do
-        begin
-          do_raise
-        rescue Chef::Mixin::Template::TemplateError => e
-          @exception = e
-        end
+
+        do_raise
+      rescue Chef::Mixin::Template::TemplateError => e
+        @exception = e
+
       end
 
       it "should have the original exception" do

data/spec/unit/mixin/windows_architecture_helper_spec.rb

@@ -50,10 +50,10 @@ describe Chef::Mixin::WindowsArchitectureHelper do
 
   it "raises an error if an invalid architecture is passed to assert_valid_windows_architecture!" do
     @invalid_architectures.each do |architecture|
-      begin
-        expect(assert_valid_windows_architecture!(architecture)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
-      rescue Chef::Exceptions::Win32ArchitectureIncorrect
-      end
+
+      expect(assert_valid_windows_architecture!(architecture)).to raise_error Chef::Exceptions::Win32ArchitectureIncorrect
+    rescue Chef::Exceptions::Win32ArchitectureIncorrect
+
     end
   end
 

data/spec/unit/node/immutable_collections_spec.rb

@@ -73,7 +73,11 @@ shared_examples_for "Immutable#to_yaml" do
   end
 
   it "should create a YAML string with content" do
-    expect(copy).to eq(parsed_yaml)
+    # Roundtrip the test string through YAML to compensate for some changes in libyaml-0.2.5
+    # See: https://github.com/yaml/libyaml/pull/186
+    expected = YAML.dump(YAML.load(parsed_yaml))
+
+    expect(copy).to eq(expected)
   end
 end
 
@@ -126,7 +130,7 @@ describe Chef::Node::ImmutableMash do
   end
 
   %w{to_h to_hash dup}.each do |immutable_meth|
-    describe "#{immutable_meth}" do
+    describe immutable_meth do
       include_examples "ImmutableMash module", description
     end
   end
@@ -234,14 +238,14 @@ describe Chef::Node::ImmutableArray do
   end
 
   %w{to_a to_array dup}.each do |immutable_meth|
-    describe "#{immutable_meth}" do
+    describe immutable_meth do
       include_examples "ImmutableArray module", description
     end
   end
 
   describe "to_yaml" do
     let(:copy) { @immutable_nested_array.to_yaml }
-    let(:parsed_yaml) { "---\n- level1\n- - foo\n  - bar\n  - baz\n  - 1\n  - 2\n  - 3\n  - \n  - true\n  - false\n  - - el\n    - 0\n    - \n- m: m\n" }
+    let(:parsed_yaml) { "---\n- level1\n- - foo\n  - bar\n  - baz\n  - 1\n  - 2\n  - 3\n  -\n  - true\n  - false\n  - - el\n    - 0\n    -\n- m: m\n" }
 
     include_examples "Immutable#to_yaml"
   end

data/spec/unit/node_spec.rb

@@ -1773,11 +1773,11 @@ describe Chef::Node do
           end
 
           let(:http_exception) do
-            begin
-              response.error!
-            rescue => e
-              e
-            end
+
+            response.error!
+          rescue => e
+            e
+
           end
 
           let(:trimmed_node) do

data/spec/unit/provider/mount/linux_spec.rb

@@ -0,0 +1,97 @@
+require "spec_helper"
+
+describe Chef::Provider::Mount::Linux do
+
+  let(:run_context) do
+    node = Chef::Node.new
+    events = Chef::EventDispatch::Dispatcher.new
+    run_context = Chef::RunContext.new(node, {}, events)
+  end
+
+  let(:new_resource) do
+    new_resource = Chef::Resource::Mount.new("/tmp/foo")
+    new_resource.device      "/dev/sdz1"
+    new_resource.device_type :device
+    new_resource.fstype      "ext3"
+    new_resource.supports remount: false
+    new_resource
+  end
+
+  let(:provider) do
+    Chef::Provider::Mount::Linux.new(new_resource, run_context)
+  end
+
+  before(:each) do
+    allow(::File).to receive(:exists?).with("/dev/sdz1").and_return true
+    allow(::File).to receive(:exists?).with("/tmp/foo").and_return true
+    allow(::File).to receive(:realpath).with("/dev/sdz1").and_return "/dev/sdz1"
+    allow(::File).to receive(:realpath).with("/tmp/foo").and_return "/tmp/foo"
+  end
+
+  context "to see if the volume is mounted" do
+
+    it "should set mounted true if the mount point is found in the mounts list" do
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo /dev/sdz1 type ext3 (rw)\n"))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_truthy
+    end
+
+    it "should set mounted false if another mount point beginning with the same path is found in the mounts list" do
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foobar /dev/sdz1 type ext3 (rw)\n"))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_falsey
+    end
+
+    it "should set mounted true if the symlink target of the device is found in the mounts list" do
+      # expand the target path to correct specs on Windows
+      target = ::File.expand_path("/dev/mapper/target")
+
+      allow(::File).to receive(:symlink?).with((new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((new_resource.device).to_s).and_return(target)
+
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo #{target} type ext3 (rw)\n"))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_truthy
+    end
+
+    it "should set mounted true if the symlink target of the device is relative and is found in the mounts list - CHEF-4957" do
+      target = "xsdz1"
+
+      # expand the target path to correct specs on Windows
+      absolute_target = ::File.expand_path("/dev/xsdz1")
+
+      allow(::File).to receive(:symlink?).with((new_resource.device).to_s).and_return(true)
+      allow(::File).to receive(:readlink).with((new_resource.device).to_s).and_return(target)
+
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: "/tmp/foo #{absolute_target} type ext3 (rw)\n"))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_truthy
+    end
+
+    it "should set mounted true if the mount point is found last in the mounts list" do
+      mount = "#{new_resource.mount_point} /dev/sdy1 type ext3 (rw)\n"
+      mount << "#{new_resource.mount_point} #{new_resource.device} type ext3 (rw)\n"
+
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: mount))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_truthy
+    end
+
+    it "should set mounted false if the mount point is not last in the mounts list" do
+      mount = "#{new_resource.device} on #{new_resource.mount_point} type ext3 (rw)\n"
+      mount << "/dev/sdy1 on #{new_resource.mount_point} type ext3 (rw)\n"
+
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: mount))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_falsey
+    end
+
+    it "mounted should be false if the mount point is not found in the mounts list" do
+      allow(provider).to receive(:shell_out!).and_return(double(stdout: "/dev/sdy1 on /tmp/foo type ext3 (rw)\n"))
+      provider.load_current_resource
+      expect(provider.current_resource.mounted).to be_falsey
+    end
+
+  end
+
+end

data/spec/unit/provider/package/chocolatey_spec.rb

@@ -150,7 +150,7 @@ describe Chef::Provider::Package::Chocolatey, :windows_only do
       new_resource.package_name("package-does-not-exist")
       new_resource.returns([0])
       allow(provider).to receive(:shell_out_compacted!)
-        .with(choco_exe, "list", "-r", "#{new_resource.package_name.first}", { returns: new_resource.returns, timeout: timeout })
+        .with(choco_exe, "list", "-r", new_resource.package_name.first, { returns: new_resource.returns, timeout: timeout })
         .and_raise(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
       expect { provider.send(:available_packages) }.to raise_error(Mixlib::ShellOut::ShellCommandFailed, "Expected process to exit with [0], but received '2'")
     end

data/spec/unit/provider/package/powershell_spec.rb

@@ -19,7 +19,7 @@
 require "spec_helper"
 require "chef/mixin/powershell_out"
 
-describe Chef::Provider::Package::Powershell, :windows_only do
+describe Chef::Provider::Package::Powershell, :windows_only, :windows_gte_10 do
   include Chef::Mixin::PowershellOut
   let(:timeout) { 900 }
   let(:source) { nil }