chef 11.14.2 → 11.14.6

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

@@ -19,6 +19,7 @@
 #
 
 require 'spec_helper'
+require 'chef/provider/user/useradd'
 
 describe Chef::Provider::User::Useradd do
 

data/spec/unit/recipe_spec.rb

@@ -182,7 +182,48 @@ describe Chef::Recipe do
         zm_resource # force let binding evaluation
         run_context.resource_collection.resources(:zen_master => "klopp").should == zm_resource
       end
+    end
+
+    describe "creating a resource with short name" do
+      # zen_follower resource has this:
+      # provides :follower, :on_platforms => ["zen"]
+      before do
+        node.stub(:[]) do |key|
+          case key
+          when :platform
+            :zen
+          when :platform_version
+            "1.0.0"
+          else
+            nil
+          end
+        end
+      end
+
+      let(:resource_follower) do
+        recipe.declare_resource(:follower, "srst") do
+          master "none"
+        end
+      end
 
+      it "defines the resource using the declaration name with short name" do
+        resource_follower
+        run_context.resource_collection.lookup("follower[srst]").should_not be_nil
+      end
+    end
+
+    describe "creating a resource with a long name" do
+      let(:resource_zn_follower) do
+        recipe.declare_resource(:zen_follower, "srst") do
+          master "none"
+        end
+      end
+
+
+      it "defines the resource using the declaration name with long name" do
+        resource_zn_follower
+        run_context.resource_collection.lookup("zen_follower[srst]").should_not be_nil
+      end
     end
 
     describe "when attempting to create a resource of an invalid type" do

data/spec/unit/resource_reporter_spec.rb

@@ -21,6 +21,7 @@
 
 require File.expand_path("../../spec_helper", __FILE__)
 require 'chef/resource_reporter'
+require 'socket'
 
 describe Chef::ResourceReporter do
   before(:all) do
@@ -707,5 +708,52 @@ describe Chef::ResourceReporter do
         @resource_reporter.run_completed(@node)
       end
     end
+
+    context "when data report post is enabled and the server response fails" do
+      before do
+        @enable_reporting_url_fatals = Chef::Config[:enable_reporting_url_fatals]
+        Chef::Config[:enable_reporting_url_fatals] = true
+        # this call doesn't matter for this context
+        @rest_client.stub(:create_url)
+      end
+
+      after do
+        Chef::Config[:enable_reporting_url_fatals] = @enable_reporting_url_fatals
+      end
+
+      it "should log 4xx errors" do
+        response = Net::HTTPClientError.new("forbidden", "403", "Forbidden")
+        error = Net::HTTPServerException.new("403 message", response)
+        @rest_client.stub(:raw_http_request).and_raise(error)
+        Chef::Log.should_receive(:error).with(/403/)
+
+        @resource_reporter.post_reporting_data
+      end
+
+      it "should log error 5xx errors" do
+        response = Net::HTTPServerError.new("internal error", "500", "Internal Server Error")
+        error = Net::HTTPFatalError.new("500 message", response)
+        @rest_client.stub(:raw_http_request).and_raise(error)
+        Chef::Log.should_receive(:error).with(/500/)
+
+        @resource_reporter.post_reporting_data
+      end
+
+      it "should log if a socket error happens" do
+        @rest_client.stub(:raw_http_request).and_raise(SocketError.new("test socket error"))
+        Chef::Log.should_receive(:error).with(/test socket error/)
+
+        @resource_reporter.post_reporting_data
+
+      end
+
+      it "should raise if an unkwown error happens" do
+        @rest_client.stub(:raw_http_request).and_raise(Exception.new)
+
+        lambda {
+          @resource_reporter.post_reporting_data
+        }.should raise_error(Exception)
+      end
+    end
   end
 end

data/spec/unit/resource_spec.rb

@@ -344,7 +344,7 @@ describe Chef::Resource do
       expected_keys = [ :allowed_actions, :params, :provider, :updated,
         :updated_by_last_action, :before, :supports,
         :noop, :ignore_failure, :name, :source_line,
-        :action, :retries, :retry_delay, :elapsed_time, 
+        :action, :retries, :retry_delay, :elapsed_time,
         :guard_interpreter, :sensitive ]
       (hash.keys - expected_keys).should == []
       (expected_keys - hash.keys).should == []
@@ -527,6 +527,13 @@ describe Chef::Resource do
       snitch_var2.should be_false
     end
 
+    it "reports 0 elapsed time if actual elapsed time is < 0" do
+      expected = Time.now
+      Time.stub(:now).and_return(expected, expected - 1)
+      @resource.run_action(:purr)
+      @resource.elapsed_time.should == 0
+    end
+
     describe "guard_interpreter attribute" do
       let(:resource) { @resource }
 
@@ -788,7 +795,7 @@ describe Chef::Resource do
     before(:each) do
        @resource_file = Chef::Resource::File.new("/nonexistent/CHEF-5098/file", @run_context)
        @action = :create
-    end 
+    end
 
     def compiled_resource_data(resource, action, err)
       error_inspector = Chef::Formatters::ErrorInspectors::ResourceFailureInspector.new(resource, action, err)

data/spec/unit/role_spec.rb

@@ -296,6 +296,12 @@ EOR
       File.should_not_receive(:exists?)
       lambda {@role.class.from_disk("lolcat")}.should raise_error(Chef::Exceptions::DuplicateRole)
     end
+
+    it "should not raise an exception if two files exist with a similar name" do
+      Dir.should_receive(:glob).and_return(["#{Chef::Config[:role_path]}/memes/lolcat.rb", "#{Chef::Config[:role_path]}/super_lolcat.rb"])
+      File.should_not_receive(:exists?)
+      lambda {@role.class.from_disk("lolcat")}.should_not raise_error(Chef::Exceptions::DuplicateRole)
+    end    
   end
 
   describe "when loading from disk and role_path is an array" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 11.14.2
+  version: 11.14.6
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-config
@@ -258,6 +258,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -1297,6 +1311,14 @@ files:
 - spec/data/lwrp_const_scoping/resources/conflict.rb
 - spec/data/lwrp_override/providers/buck_passer.rb
 - spec/data/lwrp_override/resources/foo.rb
+- spec/data/mac_users/10.7-8.plist.xml
+- spec/data/mac_users/10.7-8.shadow.xml
+- spec/data/mac_users/10.7.plist.xml
+- spec/data/mac_users/10.7.shadow.xml
+- spec/data/mac_users/10.8.plist.xml
+- spec/data/mac_users/10.8.shadow.xml
+- spec/data/mac_users/10.9.plist.xml
+- spec/data/mac_users/10.9.shadow.xml
 - spec/data/metadata/quick_start/metadata.rb
 - spec/data/nodes/default.rb
 - spec/data/nodes/test.example.com.rb
@@ -1419,6 +1441,7 @@ files:
 - spec/functional/resource/cron_spec.rb
 - spec/functional/resource/deploy_revision_spec.rb
 - spec/functional/resource/directory_spec.rb
+- spec/functional/resource/env_spec.rb
 - spec/functional/resource/file_spec.rb
 - spec/functional/resource/git_spec.rb
 - spec/functional/resource/group_spec.rb
@@ -1433,7 +1456,8 @@ files:
 - spec/functional/resource/remote_file_spec.rb
 - spec/functional/resource/rpm_spec.rb
 - spec/functional/resource/template_spec.rb
-- spec/functional/resource/user_spec.rb
+- spec/functional/resource/user/dscl_spec.rb
+- spec/functional/resource/user/useradd_spec.rb
 - spec/functional/rest_spec.rb
 - spec/functional/run_lock_spec.rb
 - spec/functional/shell_spec.rb
@@ -1475,6 +1499,7 @@ files:
 - spec/support/lib/chef/resource/cat.rb
 - spec/support/lib/chef/resource/one_two_three_four.rb
 - spec/support/lib/chef/resource/with_state.rb
+- spec/support/lib/chef/resource/zen_follower.rb
 - spec/support/lib/chef/resource/zen_master.rb
 - spec/support/lib/library_load_order.rb
 - spec/support/matchers/leak.rb