chef 14.12.9 → 14.13.11

data/spec/unit/provider/service/insserv_service_spec.rb

@@ -36,7 +36,7 @@ describe Chef::Provider::Service::Insserv do
   describe "load_current_resource" do
     describe "when startup links exist" do
       before do
-        allow(Dir).to receive(:glob).with("/etc/rc**/S*initgrediant").and_return(["/etc/rc5.d/S18initgrediant", "/etc/rc2.d/S18initgrediant", "/etc/rc4.d/S18initgrediant", "/etc/rc3.d/S18initgrediant"])
+        allow(Dir).to receive(:glob).with("/etc/rc*/**/S*initgrediant").and_return(["/etc/rc.d/rc5.d/S18initgrediant", "/etc/rc.d/rc2.d/S18initgrediant", "/etc/rc.d/rc4.d/S18initgrediant", "/etc/rc.d/rc3.d/S18initgrediant"])
       end
 
       it "sets the current enabled status to true" do
@@ -47,7 +47,7 @@ describe Chef::Provider::Service::Insserv do
 
     describe "when startup links do not exist" do
       before do
-        allow(Dir).to receive(:glob).with("/etc/rc**/S*initgrediant").and_return([])
+        allow(Dir).to receive(:glob).with("/etc/rc*/**/S*initgrediant").and_return([])
       end
 
       it "sets the current enabled status to false" do

data/spec/unit/resource_collection_spec.rb

@@ -183,6 +183,14 @@ describe Chef::ResourceCollection do
       expect(rc).to be_empty
     end
 
+    it "should allow to delete resources with different providers" do
+      pkg = Chef::Resource::YumPackage.new("monkey")
+      rc.insert(pkg, instance_name: "monkey", resource_type: "package")
+      expect(rc).not_to be_empty
+      expect(rc.delete("package[monkey]")).to eql(pkg)
+      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

data/spec/unit/resource_spec.rb

@@ -867,7 +867,7 @@ describe Chef::Resource do
       snitch_var1 = snitch_var2 = 0
       runner = Chef::Runner.new(run_context)
 
-      Chef::Provider::SnakeOil.provides :cat, __core_override__: true
+      Chef::Provider::SnakeOil.provides :cat
 
       resource1.only_if { snitch_var1 = 1 }
       resource1.not_if { snitch_var2 = 2 }
@@ -1191,17 +1191,5 @@ describe Chef::Resource do
       expect(Chef.resource_handler_map).to receive(:set).with(:test_resource, klass, { canonical: true })
       klass.resource_name(:test_resource)
     end
-
-    it "adds allow_cookbook_override when true" do
-      expect(Chef.resource_handler_map).to receive(:set).with(:test_resource, klass, { canonical: true, allow_cookbook_override: true })
-      klass.preview_resource(true)
-      klass.resource_name(:test_resource)
-    end
-
-    it "allows manually overriding back to false" do
-      expect(Chef.resource_handler_map).to receive(:set).with(:test_resource, klass, { allow_cookbook_override: false })
-      klass.preview_resource(true)
-      klass.provides(:test_resource, allow_cookbook_override: false)
-    end
   end
 end

data/spec/unit/win32/security_spec.rb

@@ -106,4 +106,29 @@ describe "Chef::Win32::Security", :windows_only do
       expect { Chef::ReservedNames::Win32::Security.get_token_information_elevation_type(token) }.to raise_error(Chef::Exceptions::Win32APIError)
     end
   end
+
+  describe "self.lookup_account_name" do
+    let(:security_class) { Chef::ReservedNames::Win32::Security }
+
+    context "when FFI::LastError.error result is ERROR_INSUFFICIENT_BUFFER" do
+      it "does not raise the exception" do
+        expect(FFI::LastError).to receive(:error).and_return(122)
+        expect { security_class.lookup_account_name "system" }.to_not raise_error
+      end
+    end
+
+    context "when operation completed successfully and FFI::LastError.error result is NO_ERROR" do
+      it "does not raise the exception" do
+        expect(FFI::LastError).to receive(:error).and_return(0)
+        expect { security_class.lookup_account_name "system" }.to_not raise_error
+      end
+    end
+
+    context "when FFI::LastError.error result is not ERROR_INSUFFICIENT_BUFFER and not NO_ERROR" do
+      it "raises Chef::ReservedNames::Win32::Error.raise! exception" do
+        expect(FFI::LastError).to receive(:error).and_return(123).at_least(:once)
+        expect { security_class.lookup_account_name "system" }.to raise_error
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 14.12.9
+  version: 14.13.11
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-19 00:00:00.000000000 Z
+date: 2019-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.12.9
+        version: 14.13.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 14.12.9
+        version: 14.13.11
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -1702,6 +1702,7 @@ files:
 - spec/data/templates/chef-seattle20160930-4388-1crv7ef.txt
 - spec/data/templates/chef-seattle20160930-4388-jjfoae.txt
 - spec/data/templates/chef-seattle20160930-4388-umeq2c.txt
+- spec/data/templates/failed.erb
 - spec/data/templates/seattle.txt
 - spec/data/trusted_certs/example.crt
 - spec/data/trusted_certs/example_no_cn.crt
@@ -1724,6 +1725,7 @@ files:
 - spec/functional/assets/chocolatey_feed/test-B.1.0.nupkg
 - spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm
 - spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm
+- spec/functional/assets/inittest
 - spec/functional/assets/mytest-1.0-1.noarch.rpm
 - spec/functional/assets/mytest-2.0-1.noarch.rpm
 - spec/functional/assets/testchefsubsys
@@ -1806,6 +1808,7 @@ files:
 - spec/functional/resource/git_spec.rb
 - spec/functional/resource/group_spec.rb
 - spec/functional/resource/ifconfig_spec.rb
+- spec/functional/resource/insserv_spec.rb
 - spec/functional/resource/link_spec.rb
 - spec/functional/resource/mount_spec.rb
 - spec/functional/resource/msu_package_spec.rb