chef 12.15.19 → 12.16.42

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

@@ -159,7 +159,7 @@ describe Chef::Provider::RemoteFile::Content do
 
   describe "when there is an array of sources and the first fails" do
 
-    # https://github.com/opscode/chef/pull/1358#issuecomment-40853299
+    # https://github.com/chef/chef/pull/1358#issuecomment-40853299
     def create_exception(exception_class)
       if [ Net::HTTPServerException, Net::HTTPFatalError ].include? exception_class
         exception_class.new("message", { "something" => 1 })

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

@@ -278,18 +278,20 @@ describe Chef::Provider::Service::Upstart do
     end
 
     it "should call the start command if one is specified" do
+      @provider.upstart_service_running = false
       allow(@new_resource).to receive(:start_command).and_return("/sbin/rsyslog startyousillysally")
       expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/rsyslog startyousillysally")
       @provider.start_service()
     end
 
     it "should call '/sbin/start service_name' if no start command is specified" do
+      @provider.upstart_service_running = false
       expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/start #{@new_resource.service_name}").and_return(shell_out_success)
       @provider.start_service()
     end
 
     it "should not call '/sbin/start service_name' if it is already running" do
-      allow(@current_resource).to receive(:running).and_return(true)
+      @provider.upstart_service_running = true
       expect(@provider).not_to receive(:shell_out_with_systems_locale!)
       @provider.start_service()
     end
@@ -310,13 +312,16 @@ describe Chef::Provider::Service::Upstart do
       @provider.restart_service()
     end
 
-    it "should call '/sbin/restart service_name' if no restart command is specified" do
-      allow(@current_resource).to receive(:running).and_return(true)
-      expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/restart #{@new_resource.service_name}").and_return(shell_out_success)
+    it "should call start/sleep/stop if no restart command is specified" do
+      @provider.upstart_service_running = true
+      expect(@provider).to receive(:stop_service)
+      expect(@provider).to receive(:sleep).with(1)
+      expect(@provider).to receive(:start_service)
       @provider.restart_service()
     end
 
     it "should call '/sbin/start service_name' if restart_service is called for a stopped service" do
+      @provider.upstart_service_running = false
       allow(@current_resource).to receive(:running).and_return(false)
       expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/start #{@new_resource.service_name}").and_return(shell_out_success)
       @provider.restart_service()
@@ -336,22 +341,24 @@ describe Chef::Provider::Service::Upstart do
     end
 
     it "should call the stop command if one is specified" do
-      allow(@current_resource).to receive(:running).and_return(true)
+      @provider.upstart_service_running = true
       allow(@new_resource).to receive(:stop_command).and_return("/sbin/rsyslog stopyousillysally")
       expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/rsyslog stopyousillysally")
       @provider.stop_service()
     end
 
     it "should call '/sbin/stop service_name' if no stop command is specified" do
-      allow(@current_resource).to receive(:running).and_return(true)
+      @provider.upstart_service_running = true
       expect(@provider).to receive(:shell_out_with_systems_locale!).with("/sbin/stop #{@new_resource.service_name}").and_return(shell_out_success)
       @provider.stop_service()
     end
 
     it "should not call '/sbin/stop service_name' if it is already stopped" do
+      @provider.upstart_service_running = false
       allow(@current_resource).to receive(:running).and_return(false)
       expect(@provider).not_to receive(:shell_out_with_systems_locale!).with("/sbin/stop #{@new_resource.service_name}")
       @provider.stop_service()
+      expect(@upstart_service_running).to be_falsey
     end
   end
 end

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

@@ -99,20 +99,43 @@ describe Chef::Provider::User::Solaris do
   end
 
   describe "when managing user locked status" do
+    let(:user_lock) { "adam:FOO:::::::" }
+    let(:shadow_file_contents) do
+      %W{
+        user1:LK:::::::
+        #{user_lock}
+        user2:NP:::::::
+      }
+    end
+
     describe "when determining if the user is locked" do
+      before do
+        allow(IO).to receive(:read).and_return(shadow_file_contents.join("\n"))
+      end
+
+      context "when user does not exist" do
+        let(:user_lock) { "other_user:FOO:::::::" }
+
+        it "should raise a sensible error" do
+          expect { provider.check_lock }.to raise_error(Chef::Exceptions::User)
+        end
+      end
 
       # locked shadow lines
       [
-        "adam:LK:::::::",
         "adam:*LK*:::::::",
         "adam:*LK*foobar:::::::",
         "adam:*LK*bahamas10:::::::",
+        "adam:*LK*goonawaLK:::::::",
+        "adam:*LK*LKgir:::::::",
         "adam:*LK*L....:::::::",
       ].each do |shadow|
-        it "should return true if user is locked with #{shadow}" do
-          shell_return = shellcmdresult.new(shadow + "\n", "", 0)
-          expect(provider).to receive(:shell_out!).with("getent", "shadow", "adam").and_return(shell_return)
-          expect(provider.check_lock).to eql(true)
+        context "for user 'adam' with entry '#{shadow}'" do
+          let(:user_lock) { shadow }
+
+          it "should return true" do
+            expect(provider.check_lock).to eql(true)
+          end
         end
       end
 
@@ -122,12 +145,16 @@ describe Chef::Provider::User::Solaris do
         "adam:*NP*:::::::",
         "adam:foobar:::::::",
         "adam:bahamas10:::::::",
+        "adam:goonawaLK:::::::",
+        "adam:LKgir:::::::",
         "adam:L...:::::::",
       ].each do |shadow|
-        it "should return false if user is unlocked with #{shadow}" do
-          shell_return = shellcmdresult.new(shadow + "\n", "", 0)
-          expect(provider).to receive(:shell_out!).with("getent", "shadow", "adam").and_return(shell_return)
-          expect(provider.check_lock).to eql(false)
+        context "for user 'adam' with entry '#{shadow}'" do
+          let(:user_lock) { shadow }
+
+          it "should return false" do
+            expect(provider.check_lock).to eql(false)
+          end
         end
       end
     end

data/spec/unit/provider/user_spec.rb

@@ -221,6 +221,12 @@ describe Chef::Provider::User do
     it "should return false if the objects are identical" do
       expect(@provider.compare_user).to eql(false)
     end
+
+    it "should ignore differences in trailing slash in home paths" do
+      @new_resource.home "/home/adam"
+      @current_resource.home "/home/adam/"
+      expect(@provider.compare_user).to eql(false)
+    end
   end
 
   describe "action_create" do

data/spec/unit/resource/apt_repository_spec.rb

@@ -24,7 +24,7 @@ describe Chef::Resource::AptRepository do
   let(:run_context) { Chef::RunContext.new(node, {}, events) }
   let(:resource) { Chef::Resource::AptRepository.new("multiverse", run_context) }
 
-  it "should create a new Chef::Resource::AptUpdate" do
+  it "should create a new Chef::Resource::AptRepository" do
     expect(resource).to be_a_kind_of(Chef::Resource)
     expect(resource).to be_a_kind_of(Chef::Resource::AptRepository)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 12.15.19
+  version: 12.16.42
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.15.19
+        version: 12.16.42
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 12.15.19
+        version: 12.16.42
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement
@@ -1183,6 +1183,10 @@ files:
 - lib/chef/node/attribute_collections.rb
 - lib/chef/node/common_api.rb
 - lib/chef/node/immutable_collections.rb
+- lib/chef/node/mixin/deep_merge_cache.rb
+- lib/chef/node/mixin/immutablize_array.rb
+- lib/chef/node/mixin/immutablize_hash.rb
+- lib/chef/node/mixin/state_tracking.rb
 - lib/chef/node_map.rb
 - lib/chef/null_logger.rb
 - lib/chef/org.rb
@@ -1835,6 +1839,7 @@ files:
 - spec/data/templates/chef-seattle20160930-4388-umeq2c.txt
 - spec/data/templates/seattle.txt
 - spec/data/trusted_certs/example.crt
+- spec/data/trusted_certs/example_no_cn.crt
 - spec/data/trusted_certs/intermediate.pem
 - spec/data/trusted_certs/opscode.pem
 - spec/data/trusted_certs/root.pem
@@ -1980,6 +1985,7 @@ files:
 - spec/integration/knife/serve_spec.rb
 - spec/integration/knife/show_spec.rb
 - spec/integration/knife/upload_spec.rb
+- spec/integration/recipes/accumulator_spec.rb
 - spec/integration/recipes/lwrp_inline_resources_spec.rb
 - spec/integration/recipes/lwrp_spec.rb
 - spec/integration/recipes/noop_resource_spec.rb
@@ -2328,6 +2334,7 @@ files:
 - spec/unit/provider/group/groupadd_spec.rb
 - spec/unit/provider/group/groupmod_spec.rb
 - spec/unit/provider/group/pw_spec.rb
+- spec/unit/provider/group/suse_spec.rb
 - spec/unit/provider/group/usermod_spec.rb
 - spec/unit/provider/group/windows_spec.rb
 - spec/unit/provider/group_spec.rb
@@ -2580,7 +2587,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A systems integration framework, built to bring the benefits of configuration