chef 12.9.41 → 12.10.24

data/spec/unit/knife/bootstrap_spec.rb

@@ -85,7 +85,7 @@ describe Chef::Knife::Bootstrap do
         let(:bootstrap_template) { "/opt/blah/not/exists/template.erb" }
 
         it "raises an error" do
-          expect { knife.find_template }.to raise_error
+          expect { knife.find_template }.to raise_error(Errno::ENOENT)
         end
       end
 
@@ -339,7 +339,7 @@ describe Chef::Knife::Bootstrap do
       let(:options) { ["--node-ssl-verify-mode", "all"] }
 
       it "raises error" do
-        expect { rendered_template }.to raise_error
+        expect { rendered_template }.to raise_error(RuntimeError)
       end
     end
 

data/spec/unit/mixin/shell_out_spec.rb

@@ -34,6 +34,10 @@ describe Chef::Mixin::ShellOut do
     let!(:capture_log_output) { Chef::Log.logger = Logger.new(output) }
     let(:assume_deprecation_log_level) { allow(Chef::Log).to receive(:level).and_return(:warn) }
 
+    before do
+      Chef::Config[:treat_deprecation_warnings_as_errors] = false
+    end
+
     context "without options" do
       let(:command_args) { [ cmd ] }
 

data/spec/unit/node/attribute_spec.rb

@@ -408,7 +408,7 @@ describe Chef::Node::Attribute do
     end
 
     it "should die if you try and do nested attributes that do not exist without read vivification" do
-      expect { @attributes["foo"]["bar"] = :baz }.to raise_error
+      expect { @attributes["foo"]["bar"] = :baz }.to raise_error(NoMethodError)
     end
 
     it "should let you set attributes manually without vivification" do

data/spec/unit/node/immutable_collections_spec.rb

@@ -97,7 +97,7 @@ describe Chef::Node::ImmutableMash do
     :shift,
   ].each do |mutator|
     it "doesn't allow mutation via `#{mutator}'" do
-      expect { @immutable_mash.send(mutator) }.to raise_error
+      expect { @immutable_mash.send(mutator) }.to raise_error(Chef::Exceptions::ImmutableAttributeModification)
     end
   end
 
@@ -154,7 +154,7 @@ describe Chef::Node::ImmutableArray do
     :unshift,
   ].each do |mutator|
     it "does not allow mutation via `#{mutator}" do
-      expect { @immutable_array.send(mutator) }.to raise_error
+      expect { @immutable_array.send(mutator) }.to raise_error(Chef::Exceptions::ImmutableAttributeModification)
     end
   end
 

data/spec/unit/node_map_spec.rb

@@ -27,7 +27,7 @@ describe Chef::NodeMap do
 
   describe "with a bad filter name" do
     it "should raise an error" do
-      expect { node_map.set(node, :thing, on_platform_family: "rhel") }.to raise_error
+      expect { node_map.set(node, :thing, on_platform_family: "rhel") }.to raise_error(ArgumentError)
     end
   end
 

data/spec/unit/property/validation_spec.rb

@@ -99,13 +99,15 @@ describe "Chef::Resource.property validation" do
         expect(resource.x nil).to be_nil
         expect(resource.x).to be_nil
       end
-      it "changing x to nil warns that the get will change to a set in Chef 13 and does not change the value" do
-        resource.instance_eval { @x = "default" }
-        expect { resource.x nil }.to raise_error Chef::Exceptions::DeprecatedFeatureError,
-          /An attempt was made to change x from "default" to nil by calling x\(nil\). In Chef 12, this does a get rather than a set. In Chef 13, this will change to set the value to nil./
-        Chef::Config[:treat_deprecation_warnings_as_errors] = false
-        expect(resource.x nil).to eq "default"
-        expect(resource.x).to eq "default"
+      unless tags.include?(:nillable)
+        it "changing x to nil warns that the get will change to a set in Chef 13 and does not change the value" do
+          resource.instance_eval { @x = "default" }
+          expect { resource.x nil }.to raise_error Chef::Exceptions::DeprecatedFeatureError,
+            /An attempt was made to change x from "default" to nil by calling x\(nil\). In Chef 12, this does a get rather than a set. In Chef 13, this will change to set the value to nil./
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
+          expect(resource.x nil).to eq "default"
+          expect(resource.x).to eq "default"
+        end
       end
     end
     if tags.include?(:nil_is_valid)
@@ -123,6 +125,15 @@ describe "Chef::Resource.property validation" do
           expect(resource.x).to eq "default"
         end
       end
+    elsif tags.include?(:nillable)
+      with_property ":x, #{validation}, nillable: true" do
+        it "changing x to nil with nillable true overwrites defaults and just works" do
+          resource.instance_eval { @x = "default" }
+          expect { resource.x nil }.not_to raise_error
+          expect(resource.x nil).to eq nil
+          expect(resource.x).to eq nil
+        end
+      end
     else
       it "property :x, #{validation}, default: nil warns that the default is invalid" do
         expect { resource_class.class_eval("property :x, #{validation}, default: nil", __FILE__, __LINE__) }.to raise_error Chef::Exceptions::DeprecatedFeatureError,
@@ -268,6 +279,11 @@ describe "Chef::Resource.property validation" do
     validation_test "[]",
       [],
       [ :a ]
+
+    validation_test "[ String, nil ], nillable: true",
+      [ nil, "thing" ],
+      [ :nope, false ],
+      :nillable
   end
 
   # is

data/spec/unit/provider/apt_repository_spec.rb

@@ -158,6 +158,11 @@ C5986B4F1257FFA86632CBA746181433FBB75451
       expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil)).to eql(target)
     end
 
+    it "should create a repository string with no distribution" do
+      target = %Q{deb      "http://test/uri" main\n}
+      expect(provider.build_repo("http://test/uri", nil, "main", false, nil)).to eql(target)
+    end
+
     it "should create a repository string with source" do
       target = %Q{deb      "http://test/uri" unstable main\ndeb-src  "http://test/uri" unstable main\n}
       expect(provider.build_repo("http://test/uri", "unstable", "main", false, nil, true)).to eql(target)

data/spec/unit/provider/apt_update_spec.rb

@@ -73,6 +73,7 @@ describe Chef::Provider::AptUpdate do
   describe "#action_periodic" do
     before do
       allow(File).to receive(:exist?)
+      allow(File).to receive(:exist?).with(Dir.tmpdir).and_return(true)
       expect(File).to receive(:exist?).with("#{stamp_dir}/update-success-stamp").and_return(true)
     end
 

data/spec/unit/provider/directory_spec.rb

@@ -185,13 +185,6 @@ describe Chef::Provider::Directory do
       end
 
       it "raises an exception when the parent directory is a file and recursive is true" do
-        FileUtils.touch tmp_dir
-        new_resource.recursive true
-        expect { directory.run_action(:create) }.to raise_error
-      end
-
-      it "raises the right exception when the parent directory is a file and recursive is true" do
-        pending "this seems to return the wrong error" # FIXME
         FileUtils.touch tmp_dir
         new_resource.recursive true
         expect { directory.run_action(:create) }.to raise_error(Chef::Exceptions::EnclosingDirectoryDoesNotExist)

data/spec/unit/provider/file/content_spec.rb

@@ -89,7 +89,7 @@ describe Chef::Provider::File::Content do
 
       it "fails when :file_desployment_uses_destdir is set" do
         Chef::Config[:file_staging_uses_destdir] = true
-        expect { content.tempfile }.to raise_error
+        expect { content.tempfile }.to raise_error(Chef::Exceptions::FileContentStagingError)
       end
 
       it "returns a tempfile in the tempdir when :file_desployment_uses_destdir is not set" do

data/spec/unit/provider/mdadm_spec.rb

@@ -76,6 +76,15 @@ describe Chef::Provider::Mdadm do
         expect(@new_resource).to be_updated_by_last_action
       end
 
+      it "should specify a layout only if set" do
+        @current_resource.exists(false)
+        @new_resource.layout("rs")
+        expected_command = "yes | mdadm --create /dev/md1 --level 5 --chunk=16 --metadata=0.90 --layout=rs --raid-devices 3 /dev/sdz1 /dev/sdz2 /dev/sdz3"
+        expect(@provider).to receive(:shell_out!).with(expected_command)
+        @provider.run_action(:create)
+        expect(@new_resource).to be_updated_by_last_action
+      end
+
       it "should not specify a chunksize if raid level 1" do
         @current_resource.exists(false)
         @new_resource.level 1

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

@@ -61,6 +61,7 @@ describe Chef::Provider::Package::EasyInstall do
 
   describe "actions_on_package" do
     it "should run easy_install with the package name and version" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install \"boto==1.8d\"",
       })
@@ -68,6 +69,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should run easy_install with the package name and version and specified options" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install --always-unzip \"boto==1.8d\"",
       })
@@ -76,6 +78,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should run easy_install with the package name and version" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install \"boto==1.8d\"",
       })
@@ -83,6 +86,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should run easy_install -m with the package name and version" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install -m boto",
       })
@@ -90,6 +94,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should run easy_install -m with the package name and version and specified options" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install -x -m boto",
       })
@@ -98,6 +103,7 @@ describe Chef::Provider::Package::EasyInstall do
     end
 
     it "should run easy_install -m with the package name and version" do
+      expect(Chef).to receive(:log_deprecation).with(/easy_install package provider is deprecated/)
       expect(@provider).to receive(:run_command).with({
         :command => "easy_install -m boto",
       })

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

@@ -562,9 +562,10 @@ describe Chef::Provider::Package::Rubygems do
 
         context "when source is a path" do
           let(:source) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" }
+          let(:domain) { { domain: :local } }
 
           it "installs the gem from file via the gems api" do
-            expect(provider.gem_env).to receive(:install).with(source)
+            expect(provider.gem_env).to receive(:install).with(source, domain)
             provider.run_action(:install)
             expect(new_resource).to be_updated_by_last_action
           end
@@ -572,10 +573,11 @@ describe Chef::Provider::Package::Rubygems do
 
         context "when the gem name is a file path and source is nil" do
           let(:gem_name) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" }
+          let(:domain) { { domain: :local } }
 
           it "installs the gem from file via the gems api" do
             expect(new_resource.source).to eq(gem_name)
-            expect(provider.gem_env).to receive(:install).with(gem_name)
+            expect(provider.gem_env).to receive(:install).with(gem_name, domain)
             provider.run_action(:install)
             expect(new_resource).to be_updated_by_last_action
           end
@@ -693,9 +695,10 @@ describe Chef::Provider::Package::Rubygems do
         context "when source is a path" do
           let(:source) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" }
           let(:target_version) { ">= 0" }
+          let(:domain) { " --local" }
 
           it "installs the gem by shelling out to gem install" do
-            expect(provider).to receive(:shell_out!).with("#{gem_binary} install #{source} -q --no-rdoc --no-ri -v \"#{target_version}\"", env: nil, timeout: 900)
+            expect(provider).to receive(:shell_out!).with("#{gem_binary} install #{source} -q --no-rdoc --no-ri -v \"#{target_version}\"#{domain}", env: nil, timeout: 900)
             provider.run_action(:install)
             expect(new_resource).to be_updated_by_last_action
           end
@@ -704,10 +707,11 @@ describe Chef::Provider::Package::Rubygems do
         context "when the package is a path and source is nil" do
           let(:gem_name) { CHEF_SPEC_DATA + "/gems/chef-integration-test-0.1.0.gem" }
           let(:target_version) { ">= 0" }
+          let(:domain) { " --local" }
 
           it "installs the gem from file by shelling out to gem install when the package is a path and the source is nil" do
             expect(new_resource.source).to eq(gem_name)
-            expect(provider).to receive(:shell_out!).with("#{gem_binary} install #{gem_name} -q --no-rdoc --no-ri -v \"#{target_version}\"", env: nil, timeout: 900)
+            expect(provider).to receive(:shell_out!).with("#{gem_binary} install #{gem_name} -q --no-rdoc --no-ri -v \"#{target_version}\"#{domain}", env: nil, timeout: 900)
             provider.run_action(:install)
             expect(new_resource).to be_updated_by_last_action
           end

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

@@ -1578,7 +1578,7 @@ describe Chef::Provider::Package::Yum::RPMDb do
     end
 
     it "should only accept an RPMDbPackage object" do
-      expect { @rpmdb.push("string") }.to raise_error
+      expect { @rpmdb.push("string") }.to raise_error(ArgumentError)
     end
 
     it "should add the package to the package db" do

data/spec/unit/provider/powershell_script_spec.rb

@@ -74,7 +74,7 @@ describe Chef::Provider::PowershellScript, "action_run" do
 
         provider_flags.find do |value|
           execution_policy_index += 1
-          execution_policy_specified = value.downcase == "-ExecutionPolicy".downcase
+          execution_policy_specified = value.casecmp("-ExecutionPolicy".downcase).zero?
         end
 
         execution_policy = execution_policy_specified ? provider_flags[execution_policy_index] : nil

data/spec/unit/provider/user/dscl_spec.rb

@@ -294,7 +294,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
       let(:dscl_exists) { false }
 
       it "should raise an error" do
-        expect { run_requirements }.to raise_error
+        expect { run_requirements }.to raise_error(Chef::Exceptions::User)
       end
     end
 
@@ -302,7 +302,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
       let(:plutil_exists) { false }
 
       it "should raise an error" do
-        expect { run_requirements }.to raise_error
+        expect { run_requirements }.to raise_error(Chef::Exceptions::User)
       end
     end
 
@@ -312,7 +312,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
       }
 
       it "should raise an error" do
-        expect { run_requirements }.to raise_error
+        expect { run_requirements }.to raise_error(Chef::Exceptions::User)
       end
     end
 
@@ -333,7 +333,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
         let(:password) { salted_sha512_pbkdf2_password }
 
         it "should raise an error" do
-          expect { run_requirements }.to raise_error
+          expect { run_requirements }.to raise_error(Chef::Exceptions::User)
         end
       end
     end
@@ -348,7 +348,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
           let(:password) { salted_sha512_password }
 
           it "should raise an error" do
-            expect { run_requirements }.to raise_error
+            expect { run_requirements }.to raise_error(Chef::Exceptions::User)
           end
         end
 
@@ -357,7 +357,7 @@ ea18e18b720e358e7fbe3cfbeaa561456f6ba008937a30"
 
           describe "when salt and iteration is not set" do
             it "should raise an error" do
-              expect { run_requirements }.to raise_error
+              expect { run_requirements }.to raise_error(Chef::Exceptions::User)
             end
           end
 

data/spec/unit/recipe_spec.rb

@@ -306,6 +306,7 @@ describe Chef::Recipe do
 
       it "does not insert two resources if create_if_missing is used" do
         zm_resource
+        Chef::Config[:treat_deprecation_warnings_as_errors] = false
         recipe.declare_resource(:zen_master, "klopp", create_if_missing: true)
         expect(run_context.resource_collection.count).to eql(1)
       end

data/spec/unit/resource/apt_repository_spec.rb

@@ -31,4 +31,8 @@ describe Chef::Resource::AptRepository do
     expect(resource.keyserver).to eql("keyserver.ubuntu.com")
   end
 
+  it "the default distribution should be nillable" do
+    expect(resource.distribution(nil)).to eql(nil)
+    expect(resource.distribution).to eql(nil)
+  end
 end

data/spec/unit/resource/file/verification_spec.rb

@@ -43,7 +43,7 @@ describe Chef::Resource::File::Verification do
     it "expects a string argument" do
       v = Chef::Resource::File::Verification.new(parent_resource, nil, {}) {}
       expect { v.verify("/foo/bar") }.to_not raise_error
-      expect { v.verify }.to raise_error
+      expect { v.verify }.to raise_error(ArgumentError)
     end
 
     it "accepts an options hash" do

data/spec/unit/resource/file_spec.rb

@@ -70,8 +70,8 @@ describe Chef::Resource::File do
     expect { @resource.verify {} }.not_to raise_error
     expect { @resource.verify "" }.not_to raise_error
     expect { @resource.verify :json }.not_to raise_error
-    expect { @resource.verify true }.to raise_error
-    expect { @resource.verify false }.to raise_error
+    expect { @resource.verify true }.to raise_error(ArgumentError)
+    expect { @resource.verify false }.to raise_error(ArgumentError)
   end
 
   it "should accept multiple verify statements" do

data/spec/unit/resource/mdadm_spec.rb

@@ -65,8 +65,13 @@ describe Chef::Resource::Mdadm do
   end
 
   it "should allow you to set the bitmap attribute" do
-    @resource.metadata "internal"
-    expect(@resource.metadata).to eql("internal")
+    @resource.bitmap "internal"
+    expect(@resource.bitmap).to eql("internal")
+  end
+
+  it "should allow you to set the layout attribute" do
+    @resource.layout "f2"
+    expect(@resource.layout).to eql("f2")
   end
 
   it "should allow you to set the devices attribute" do

data/spec/unit/resource_collection_spec.rb

@@ -162,6 +162,36 @@ describe Chef::ResourceCollection do
     end
   end
 
+  describe "delete" do
+    it "should allow you to delete resources by name via delete" do
+      zmr = Chef::Resource::ZenMaster.new("dog")
+      rc << zmr
+      expect(rc).not_to be_empty
+      expect(rc.delete(zmr.to_s)).to eql(zmr)
+      expect(rc).to be_empty
+
+      zmr = Chef::Resource::ZenMaster.new("cat")
+      rc[0] = zmr
+      expect(rc).not_to be_empty
+      expect(rc.delete(zmr)).to eql(zmr)
+      expect(rc).to be_empty
+
+      zmr = Chef::Resource::ZenMaster.new("monkey")
+      rc.push(zmr)
+      expect(rc).not_to be_empty
+      expect(rc.delete(zmr)).to eql(zmr)
+      expect(rc).to be_empty
+    end
+
+    it "should raise an exception if you send something strange to delete" do
+      expect { rc.delete(:symbol) }.to raise_error(ArgumentError)
+    end
+
+    it "should raise an exception if it cannot find a resource with delete" do
+      expect { rc.delete("zen_master[dog]") }.to raise_error(Chef::Exceptions::ResourceNotFound)
+    end
+  end
+
   describe "resources" do
 
     it "should find a resource by symbol and name (:zen_master => monkey)" do

data/spec/unit/resource_spec.rb

@@ -542,7 +542,7 @@ describe Chef::Resource do
       allow(provider).to receive(:action_purr).and_raise
 
       expect(retriable_resource).to receive(:sleep).exactly(3).times
-      expect { retriable_resource.run_action(:purr) }.to raise_error
+      expect { retriable_resource.run_action(:purr) }.to raise_error(RuntimeError)
       expect(retriable_resource.retries).to eq(3)
     end
   end