chef 13.1.31-universal-mingw32 → 13.2.20-universal-mingw32

data/spec/integration/knife/common_options_spec.rb

@@ -22,6 +22,14 @@ describe "knife common options", :workstation do
   include IntegrationSupport
   include KnifeSupport
 
+  before do
+    # Allow this for testing the various port binding stuffs. Remove when
+    # we kill off --listen.
+    Chef::Config.treat_deprecation_warnings_as_errors(false)
+  end
+
+  let(:local_listen_warning) { /\Awarn:.*local.*listen.*$/i }
+
   when_the_repository "has a node" do
     before { file "nodes/x.json", {} }
 
@@ -30,15 +38,20 @@ describe "knife common options", :workstation do
         Chef::Config.chef_zero.enabled = true
       end
 
-      it "knife raw /nodes/x should retrieve the node" do
+      it "knife raw /nodes/x should retrieve the node in socketless mode" do
+        Chef::Config.treat_deprecation_warnings_as_errors(true)
         knife("raw /nodes/x").should_succeed( /"name": "x"/ )
       end
 
+      it "knife raw /nodes/x should retrieve the node" do
+        knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
+      end
+
       context "And chef_zero.port is 9999" do
         before(:each) { Chef::Config.chef_zero.port = 9999 }
 
         it "knife raw /nodes/x should retrieve the node" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
           expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
         end
       end
@@ -48,7 +61,7 @@ describe "knife common options", :workstation do
         before(:each) { Chef::Config.chef_zero.host = "0.0.0.0" }
 
         it "knife raw /nodes/x should retrieve the role" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         end
       end
 
@@ -86,21 +99,26 @@ EOM
         end
 
         it "knife raw /nodes/x should retrieve the node" do
-          knife("raw /nodes/x").should_succeed( /"name": "x"/ )
+          knife("raw --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         end
       end
     end
 
-    it "knife raw -z /nodes/x retrieves the node" do
+    it "knife raw -z /nodes/x retrieves the node in socketless mode" do
+      Chef::Config.treat_deprecation_warnings_as_errors(true)
       knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
     end
 
+    it "knife raw -z /nodes/x retrieves the node" do
+      knife("raw -z --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
+    end
+
     it "knife raw --local-mode /nodes/x retrieves the node" do
-      knife("raw --local-mode /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw --local-mode --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
     end
 
     it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
-      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw -z --chef-zero-port=9999 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
       expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
 
@@ -118,7 +136,7 @@ EOM
       end
 
       it "knife raw -z /nodes/x retrieves the node" do
-        knife("raw -z /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be > 8889
       end
     end
@@ -137,18 +155,18 @@ EOM
       end
 
       it "knife raw -z --chef-zero-port=9999-20000 /nodes/x" do
-        knife("raw -z --chef-zero-port=9999-20000 /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --chef-zero-port=9999-20000 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be > 9999
       end
 
       it "knife raw -z --chef-zero-port=9999-9999,19423" do
-        knife("raw -z --chef-zero-port=9999-9999,19423 /nodes/x").should_succeed( /"name": "x"/ )
+        knife("raw -z --chef-zero-port=9999-9999,19423 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
         expect(URI(Chef::Config.chef_server_url).port).to be == 19423
       end
     end
 
     it "knife raw -z --chef-zero-port=9999 /nodes/x retrieves the node" do
-      knife("raw -z --chef-zero-port=9999 /nodes/x").should_succeed( /"name": "x"/ )
+      knife("raw -z --chef-zero-port=9999 --listen /nodes/x").should_succeed( /"name": "x"/, stderr: local_listen_warning )
       expect(Chef::Config.chef_server_url).to eq("chefzero://localhost:9999")
     end
   end

data/spec/integration/knife/cookbook_bulk_delete_spec.rb

@@ -34,7 +34,7 @@ describe "knife cookbook bulk delete", :workstation do
       cookbook "zfa", "0.6.5"
     end
 
-    # rubocop:disable Style/TrailingWhitespace
+    # rubocop:disable Layout/TrailingWhitespace
     it "knife cookbook bulk delete deletes all matching cookbooks" do
       stdout = <<EOM
 All versions of the following cookbooks will be deleted:
@@ -58,7 +58,7 @@ fax   0.6.0
 zfa   0.6.5
 EOM
     end
-    # rubocop:enable Style/TrailingWhitespace
+    # rubocop:enable Layout/TrailingWhitespace
 
   end
 end

data/spec/integration/knife/cookbook_show_spec.rb

@@ -34,7 +34,7 @@ describe "knife cookbook show", :workstation do
       knife("cookbook show x").should_succeed "x   1.0.0  0.6.5\n"
     end
 
-    # rubocop:disable Style/TrailingWhitespace
+    # rubocop:disable Layout/TrailingWhitespace
     it "knife cookbook show x 1.0.0 shows the correct version" do
       knife("cookbook show x 1.0.0").should_succeed <<EOM
 cookbook_name: x
@@ -127,7 +127,7 @@ specificity: default
 url:         http://127.0.0.1:8900/file_store/checksums/d41d8cd98f00b204e9800998ecf8427e
 EOM
     end
-    # rubocop:enable Style/TrailingWhitespace
+    # rubocop:enable Layout/TrailingWhitespace
 
     it "knife cookbook show x 1.0.0 recipes default.rb shows the default recipe" do
       knife("cookbook show x 1.0.0 recipes default.rb").should_succeed "file 'n'\n"

data/spec/integration/knife/environment_compare_spec.rb

@@ -42,7 +42,7 @@ describe "knife environment compare", :workstation do
       }
     end
 
-    # rubocop:disable Style/TrailingWhitespace
+    # rubocop:disable Layout/TrailingWhitespace
     it "displays the cookbooks for a single environment" do
       knife("environment compare x").should_succeed <<EOM
       x       
@@ -69,6 +69,6 @@ krad  >= 1.0.0  >= 1.0.0
 
 EOM
     end
-    # rubocop:enable Style/TrailingWhitespace
+    # rubocop:enable Layout/TrailingWhitespace
   end
 end

data/spec/integration/knife/environment_show_spec.rb

@@ -30,7 +30,7 @@ describe "knife environment show", :workstation do
       }
     end
 
-    # rubocop:disable Style/TrailingWhitespace
+    # rubocop:disable Layout/TrailingWhitespace
     it "shows an environment" do
       knife("environment show b").should_succeed <<EOM
 chef_type:           environment
@@ -45,7 +45,7 @@ name:                b
 override_attributes:
 EOM
     end
-    # rubocop:enable Style/TrailingWhitespace
+    # rubocop:enable Layout/TrailingWhitespace
 
     it "shows the requested attribute of an environment" do
       knife("environment show b -a default_attributes").should_succeed <<EOM

data/spec/integration/knife/role_show_spec.rb

@@ -31,7 +31,7 @@ describe "knife role show", :workstation do
       role "cat", {}
     end
 
-    # rubocop:disable Style/TrailingWhitespace
+    # rubocop:disable Layout/TrailingWhitespace
     it "shows a cookbook" do
       knife("role show cons").should_succeed <<EOM
 chef_type:           role
@@ -44,7 +44,7 @@ override_attributes:
 run_list:
 EOM
     end
-    # rubocop:enable Style/TrailingWhitespace
+    # rubocop:enable Layout/TrailingWhitespace
 
   end
 end

data/spec/integration/recipes/accumulator_spec.rb

@@ -62,7 +62,7 @@ describe "Accumulators" do
           default_action :create
 
           action :create do
-            email_alias address do
+            email_alias new_resource.address do
               recipients new_resource.recipients
             end
           end
@@ -78,7 +78,7 @@ describe "Accumulators" do
           default_action :create
 
           action :create do
-            nested address do
+            nested new_resource.address do
               recipients new_resource.recipients
             end
           end
@@ -149,8 +149,8 @@ describe "Accumulators" do
                 delayed_action :create
               end
             end
-            r.variables[:aliases][address] ||= []
-            r.variables[:aliases][address] += new_resource.recipients
+            r.variables[:aliases][new_resource.address] ||= []
+            r.variables[:aliases][new_resource.address] += new_resource.recipients
           end
         EOM
 
@@ -164,7 +164,7 @@ describe "Accumulators" do
           default_action :create
 
           action :create do
-            email_alias address do
+            email_alias new_resource.address do
               recipients new_resource.recipients
             end
           end
@@ -180,7 +180,7 @@ describe "Accumulators" do
           default_action :create
 
           action :create do
-            nested address do
+            nested new_resource.address do
               recipients new_resource.recipients
             end
           end

data/spec/integration/recipes/resource_action_spec.rb

@@ -416,6 +416,7 @@ module ResourceActionSpec
         attr_reader :x_warning_line
 
         it "Using the enclosing resource to set x to x emits a warning that you're using the wrong x" do
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
           recipe = converge do
             resource_action_spec_also_with_x "hi" do
               x 1
@@ -423,34 +424,43 @@ module ResourceActionSpec
             end
           end
           warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
-          expect(warnings.size).to eq 1
+          expect(warnings.size).to eq 2
           expect(warnings[0]).to match(/property x is declared in both resource_action_spec_with_x\[hi\] and resource_action_spec_also_with_x\[hi\] action :set_x_to_x. Use new_resource.x instead. At #{__FILE__}:#{ResourceActionSpecAlsoWithX.x_warning_line}/)
         end
 
         it "Using the enclosing resource to set x to x outside the initializer emits no warning" do
-          expect_recipe do
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
+          recipe = converge do
             resource_action_spec_also_with_x "hi" do
               x 1
               action :set_x_to_x_in_non_initializer
             end
-          end.to emit_no_warnings_or_errors
+          end
+          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
+          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
         end
 
         it "Using the enclosing resource to set x to 10 emits no warning" do
-          expect_recipe do
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
+          recipe = converge do
             resource_action_spec_also_with_x "hi" do
               x 1
               action :set_x_to_10
             end
-          end.to emit_no_warnings_or_errors
+          end
+          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
+          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
         end
 
         it "Using the enclosing resource to set x to 10 emits no warning" do
-          expect_recipe do
+          Chef::Config[:treat_deprecation_warnings_as_errors] = false
+          recipe = converge do
             r = resource_action_spec_also_with_x "hi"
             r.x 1
             r.action :set_x_to_10
-          end.to emit_no_warnings_or_errors
+          end
+          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
+          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
         end
       end
 
@@ -496,6 +506,7 @@ module ResourceActionSpec
       end
 
       it "Raises an error when attempting to use a template in the action" do
+        Chef::Config[:treat_deprecation_warnings_as_errors] = false
         expect_converge do
           has_property_named_template "hi"
         end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block.  Possible property-resource collision.  To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)

data/spec/integration/recipes/resource_load_spec.rb

@@ -32,7 +32,7 @@ describe "Resource.load_current_value" do
         @created
       end
       action :create do
-        new_resource.class.created_x = x
+        new_resource.class.created_x = new_resource.x
       end
     end
     result.resource_name resource_name
@@ -45,10 +45,10 @@ describe "Resource.load_current_value" do
   context "with a resource with load_current_value" do
     before :each do
       resource_class.load_current_value do
-        x "loaded #{Namer.incrementing_value} (#{self.class.properties.sort_by { |name, p| name }.
-          select { |name, p| p.is_set?(self) }.
-          map { |name, p| "#{name}=#{p.get(self)}" }.
-          join(", ")})"
+        x "loaded #{Namer.incrementing_value} (#{self.class.properties.sort_by { |name, p| name }
+          .select { |name, p| p.is_set?(self) }
+          .map { |name, p| "#{name}=#{p.get(self)}" }
+          .join(", ")})"
       end
     end
 
@@ -119,22 +119,6 @@ describe "Resource.load_current_value" do
       end
     end
 
-    context "and a resource with no values set" do
-      let(:resource) do
-        e = self
-        r = nil
-        converge do
-          r = public_send(e.resource_name, "blah") do
-          end
-        end
-        r
-      end
-
-      it "the provider accesses values from load_current_value" do
-        expect(resource.class.created_x).to eq "loaded 1 (name=blah)"
-      end
-    end
-
     let (:subresource_name) do
       :"load_current_value_subresource_dsl#{Namer.current_index}"
     end

data/spec/spec_helper.rb

@@ -149,6 +149,8 @@ RSpec.configure do |config|
   config.filter_run_excluding :windows64_only => true unless windows64?
   config.filter_run_excluding :windows32_only => true unless windows32?
   config.filter_run_excluding :windows_nano_only => true unless windows_nano_server?
+  config.filter_run_excluding :windows_gte_10 => true unless windows_gte_10?
+  config.filter_run_excluding :windows_lt_10 => true if windows_gte_10?
   config.filter_run_excluding :ruby64_only => true unless ruby_64bit?
   config.filter_run_excluding :ruby32_only => true unless ruby_32bit?
   config.filter_run_excluding :windows_powershell_dsc_only => true unless windows_powershell_dsc?

data/spec/support/platform_helpers.rb

@@ -70,6 +70,11 @@ def windows_2012r2?
   (host_version && host_version.start_with?("6.3"))
 end
 
+def windows_gte_10?
+  return false unless windows?
+  Gem::Requirement.new(">= 10").satisfied_by?(Gem::Version.new(host_version))
+end
+
 def host_version
   @host_version ||= begin
     wmi = WmiLite::Wmi.new

data/spec/support/shared/unit/provider/useradd_based_user_provider.rb

@@ -85,7 +85,7 @@ shared_examples_for "a useradd-based user provider" do |supported_useradd_option
 
     it "should combine all the possible options" do
       combined_opts = []
-      supported_useradd_options.sort { |a, b| a[0] <=> b[0] }.each do |attribute, option|
+      supported_useradd_options.sort_by { |a| a[0] }.each do |attribute, option|
         allow(@new_resource).to receive(attribute).and_return("hola")
         combined_opts << option << "hola"
       end

data/spec/unit/application/client_spec.rb

@@ -257,6 +257,7 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
       before do
         allow(@app).to receive(:interval_sleep).with(wait_secs).and_return true
         allow(@app).to receive(:interval_sleep).with(0).and_call_original
+        allow(@app).to receive(:time_to_sleep).and_return(1)
       end
 
       it "sleeps for the amount of time passed" do
@@ -519,6 +520,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
     end
 
     it "shouldn't sleep when sent USR1" do
+      allow(@app).to receive(:interval_sleep).and_return true
       allow(@app).to receive(:interval_sleep).with(0).and_call_original
       pid = fork do
         @app.run_application

data/spec/unit/knife_spec.rb

@@ -439,6 +439,28 @@ describe Chef::Knife do
       expect(stderr.string).to match(%r{Response:  y u no administrator})
     end
 
+    context "when proxy servers are set" do
+      before do
+        ENV["http_proxy"] = "xyz"
+      end
+
+      after do
+        ENV.delete("http_proxy")
+      end
+
+      it "formats proxy errors nicely" do
+        response = Net::HTTPForbidden.new("1.1", "403", "Forbidden")
+        response.instance_variable_set(:@read, true)
+        allow(response).to receive(:body).and_return(Chef::JSONCompat.to_json(:error => "y u no administrator"))
+        allow(knife).to receive(:run).and_raise(Net::HTTPServerException.new("403 Forbidden", response))
+        allow(knife).to receive(:username).and_return("sadpanda")
+        knife.run_with_pretty_exceptions
+        expect(stderr.string).to match(%r{ERROR: You authenticated successfully to http.+ as sadpanda but you are not authorized for this action})
+        expect(stderr.string).to match(%r{ERROR: There are proxy servers configured, your Chef server may need to be added to NO_PROXY.})
+        expect(stderr.string).to match(%r{Response:  y u no administrator})
+      end
+    end
+
     it "formats 400s nicely" do
       response = Net::HTTPBadRequest.new("1.1", "400", "Bad Request")
       response.instance_variable_set(:@read, true) # I hate you, net/http.

data/spec/unit/policy_builder/policyfile_spec.rb

@@ -330,6 +330,56 @@ describe Chef::PolicyBuilder::Policyfile do
 
       end
 
+      describe "#build_node" do
+
+        let(:node) do
+          node = Chef::Node.new
+          node.name(node_name)
+          node
+        end
+
+        before do
+          allow(policy_builder).to receive(:node).and_return(node)
+        end
+
+        context "when the run is successful" do
+          let(:run_list) do
+            ["recipe[test::default]",
+             "recipe[test::other]"]
+          end
+
+          let(:version_hash) do
+            {
+              "version" => "0.1.0",
+              "identifier" => "012345678",
+            }
+          end
+
+          let(:run_list_for_data_collector) do
+            {
+              :id => "_policy_node",
+              :run_list => [
+               { :type => "recipe", :name => "test::default", :skipped => false, :version => nil },
+               { :type => "recipe", :name => "test::other", :skipped => false, :version => nil },
+              ],
+            }
+          end
+
+          before do
+            allow(policy_builder).to receive(:run_list)
+                                      .and_return(run_list)
+            allow(policy_builder).to receive(:cookbook_lock_for)
+                                      .and_return(version_hash)
+          end
+
+          it "sends the run_list_expanded event" do
+            policy_builder.build_node
+            expect(policy_builder.run_list_expansion_ish.to_hash)
+              .to eq(run_list_for_data_collector)
+          end
+        end
+      end
+
       describe "building the node object" do
 
         let(:extra_chef_config) { {} }