chef 12.4.3-universal-mingw32 → 12.5.1-universal-mingw32

data/spec/functional/win32/{registry_helper_spec.rb → registry_spec.rb}

@@ -20,25 +20,6 @@
 require 'spec_helper'
 require 'chef/win32/registry'
 
-describe Chef::Resource::RegistryKey, :unix_only do
-  before(:all) do
-    events = Chef::EventDispatch::Dispatcher.new
-    node = Chef::Node.new
-    ohai = Ohai::System.new
-    ohai.all_plugins
-    node.consume_external_attrs(ohai.data,{})
-    run_context = Chef::RunContext.new(node, {}, events)
-    @resource = Chef::Resource::RegistryKey.new("HKCU\\Software", run_context)
-  end
-  context "when load_current_resource is run on a non-windows node" do
-    it "throws an exception because you don't have a windows registry (derp)" do
-      @resource.key("HKCU\\Software\\Opscode")
-      @resource.values([{:name=>"Color", :type=>:string, :data=>"Orange"}])
-      expect{@resource.run_action(:create)}.to raise_error(Chef::Exceptions::Win32NotWindows)
-    end
-  end
-end
-
 describe 'Chef::Win32::Registry', :windows_only do
 
   before(:all) do
@@ -130,6 +111,9 @@ describe 'Chef::Win32::Registry', :windows_only do
     it "returns true if the value exists" do
       expect(@registry.value_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"Petals"})).to eq(true)
     end
+    it "returns true if the value exists with a case mismatch on the value name" do
+      expect(@registry.value_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"petals"})).to eq(true)
+    end
     it "returns false if the value does not exist" do
       expect(@registry.value_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"FOOBAR"})).to eq(false)
     end
@@ -145,6 +129,9 @@ describe 'Chef::Win32::Registry', :windows_only do
     it "returns true if the value exists" do
       expect(@registry.value_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"Petals"})).to eq(true)
     end
+    it "returns true if the value exists with a case mismatch on the value name" do
+      expect(@registry.value_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"petals"})).to eq(true)
+    end
     it "throws an exception if the value does not exist" do
       expect {@registry.value_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"FOOBAR"})}.to raise_error(Chef::Exceptions::Win32RegValueMissing)
     end
@@ -160,6 +147,9 @@ describe 'Chef::Win32::Registry', :windows_only do
     it "returns true if all the data matches" do
       expect(@registry.data_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"Petals", :type=>:multi_string, :data=>["Pink", "Delicate"]})).to eq(true)
     end
+    it "returns true if all the data matches with a case mismatch on the data name" do
+      expect(@registry.data_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"petals", :type=>:multi_string, :data=>["Pink", "Delicate"]})).to eq(true)
+    end
     it "returns false if the name does not exist" do
       expect(@registry.data_exists?("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"slateP", :type=>:multi_string, :data=>["Pink", "Delicate"]})).to eq(false)
     end
@@ -181,6 +171,9 @@ describe 'Chef::Win32::Registry', :windows_only do
     it "returns true if all the data matches" do
       expect(@registry.data_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"Petals", :type=>:multi_string, :data=>["Pink", "Delicate"]})).to eq(true)
     end
+    it "returns true if all the data matches with a case mismatch on the data name" do
+      expect(@registry.data_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"petals", :type=>:multi_string, :data=>["Pink", "Delicate"]})).to eq(true)
+    end
     it "throws an exception if the name does not exist" do
       expect {@registry.data_exists!("HKCU\\Software\\Root\\Branch\\Flower", {:name=>"slateP", :type=>:multi_string, :data=>["Pink", "Delicate"]})}.to raise_error(Chef::Exceptions::Win32RegDataMissing)
     end
@@ -544,11 +537,11 @@ describe 'Chef::Win32::Registry', :windows_only do
       end
 
       after(:all) do
-        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software\\Root", ::Win32::Registry::KEY_ALL_ACCESS | 0x0100) do |reg|
-          reg.delete_key("Trunk", true)
+        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software", ::Win32::Registry::KEY_ALL_ACCESS | 0x0100) do |reg|
+          reg.delete_key("Root", true)
         end
-        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software\\Root", ::Win32::Registry::KEY_ALL_ACCESS | 0x0200) do |reg|
-          reg.delete_key("Trunk", true)
+        ::Win32::Registry::HKEY_LOCAL_MACHINE.open("Software", ::Win32::Registry::KEY_ALL_ACCESS | 0x0200) do |reg|
+          reg.delete_key("Root", true)
         end
       end
 

data/spec/functional/win32/service_manager_spec.rb

@@ -33,7 +33,7 @@ end
 # directories.
 #
 
-describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only do
+describe "Chef::Application::WindowsServiceManager", :windows_only, :system_windows_service_gem_only, :appveyor_only do
 
   include_context "using Win32::Service"
 
@@ -43,7 +43,7 @@ describe "Chef::Application::WindowsServiceManager", :windows_only, :system_wind
     end
 
     it "throws an error with required missing options" do
-      test_service.each do |key,value|
+      [:service_name, :service_display_name, :service_description, :service_file_path].each do |key|
         service_def = test_service.dup
         service_def.delete(key)
 

data/spec/integration/client/client_spec.rb

@@ -303,6 +303,57 @@ EOM
 
   end
 
+  when_the_repository "has a cookbook that generates deprecation warnings" do
+    before do
+      file 'cookbooks/x/recipes/default.rb', <<-EOM
+        class ::MyResource < Chef::Resource
+          use_automatic_resource_name
+          property :x, default: []
+          property :y, default: {}
+        end
+
+        my_resource 'blah' do
+          1.upto(10) do
+            x nil
+          end
+          x nil
+        end
+      EOM
+    end
+
+    def match_indices(regex, str)
+      result = []
+      pos = 0
+      while match = regex.match(str, pos)
+        result << match.begin(0)
+        pos = match.end(0) + 1
+      end
+      result
+    end
+
+    it "should output each deprecation warning only once, at the end of the run" do
+      file 'config/client.rb', <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+# Mimick what happens when you are on the console
+formatters << :doc
+log_level :warn
+EOM
+
+      ENV.delete('CHEF_TREAT_DEPRECATION_WARNINGS_AS_ERRORS')
+
+      result = shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
+      expect(result.error?).to be_falsey
+
+      # Search to the end of the client run in the output
+      run_complete = result.stdout.index("Running handlers complete")
+      expect(run_complete).to be >= 0
+
+      # Make sure there is exactly one result for each, and that it occurs *after* the complete message.
+      expect(match_indices(/nil currently does not overwrite the value of/, result.stdout)).to match([ be > run_complete ])
+    end
+  end
+
   when_the_repository "has a cookbook with only an audit recipe" do
 
     before do

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -24,6 +24,8 @@ describe 'chef_repo_path tests', :workstation do
   include IntegrationSupport
   include KnifeSupport
 
+  let(:error_rel_path_outside_repo) { /^ERROR: Attempt to use relative path '' when current directory is outside the repository path/ }
+
   # TODO alternate repo_path / *_path
   context 'alternate *_path' do
     when_the_repository 'has clients and clients2, cookbooks and cookbooks2, etc.' do
@@ -109,14 +111,14 @@ EOM
         context 'when cwd is at the top level' do
           before { cwd '.' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
           before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -192,14 +194,14 @@ EOM
         context 'when cwd is inside the data_bags directory' do
           before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
         context 'when cwd is inside chef_repo2' do
           before { cwd 'chef_repo2' }
           it 'knife list -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -225,14 +227,14 @@ EOM
         context 'when cwd is at the top level' do
           before { cwd '.' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
           before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -445,7 +447,7 @@ EOM
         context 'when cwd is at the top level' do
           before { cwd '.' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -621,14 +623,14 @@ EOM
         context 'when cwd is at the top level' do
           before { cwd '.' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
         context 'when cwd is inside the data_bags directory' do
           before { cwd 'data_bags' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -782,7 +784,7 @@ EOM
         context 'when cwd is at the top level' do
           before { cwd '.' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
 
@@ -823,7 +825,7 @@ EOM
         context 'when cwd is inside chef_repo2/data_bags' do
           before { cwd 'chef_repo2/data_bags' }
           it 'knife list --local -Rfp fails' do
-            knife('list --local -Rfp').should_fail("ERROR: Attempt to use relative path '' when current directory is outside the repository path\n")
+            knife('list --local -Rfp').should_fail(error_rel_path_outside_repo)
           end
         end
       end

data/spec/integration/knife/download_spec.rb

@@ -1113,11 +1113,13 @@ Created /acls/clients/foo-validator.json
 Created /acls/containers
 Created /acls/containers/clients.json
 Created /acls/containers/containers.json
+Created /acls/containers/cookbook_artifacts.json
 Created /acls/containers/cookbooks.json
 Created /acls/containers/data.json
 Created /acls/containers/environments.json
 Created /acls/containers/groups.json
 Created /acls/containers/nodes.json
+Created /acls/containers/policies.json
 Created /acls/containers/roles.json
 Created /acls/containers/sandboxes.json
 Created /acls/containers/x.json
@@ -1139,11 +1141,13 @@ Created /clients/foo-validator.json
 Created /containers
 Created /containers/clients.json
 Created /containers/containers.json
+Created /containers/cookbook_artifacts.json
 Created /containers/cookbooks.json
 Created /containers/data.json
 Created /containers/environments.json
 Created /containers/groups.json
 Created /containers/nodes.json
+Created /containers/policies.json
 Created /containers/roles.json
 Created /containers/sandboxes.json
 Created /containers/x.json

data/spec/integration/knife/list_spec.rb

@@ -702,11 +702,13 @@ foo-validator.json
 /acls/containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -733,11 +735,13 @@ foo-validator.json
 /containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -804,11 +808,13 @@ foo-validator.json
 /acls/containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 
@@ -835,11 +841,13 @@ foo-validator.json
 /containers:
 clients.json
 containers.json
+cookbook_artifacts.json
 cookbooks.json
 data.json
 environments.json
 groups.json
 nodes.json
+policies.json
 roles.json
 sandboxes.json
 

data/spec/integration/knife/upload_spec.rb

@@ -198,7 +198,7 @@ Created /nodes/y.json
 Created /roles/y.json
 Created /users/y.json
 EOM
-            knife('diff --name-status /').should_succeed ''
+            knife('diff /').should_succeed ''
           end
 
           it 'knife upload --no-diff adds the new files' do

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -119,7 +119,7 @@ describe "Recipe DSL methods" do
             recipe = converge {
               backcompat_thingy 'blah' do; end
             }
-            expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'resource_name :backcompat_thingy'./)
+            expect(recipe.logged_warnings).to match(/Class Chef::Provider::BackcompatThingy does not declare 'provides :backcompat_thingy'./)
             expect(BaseThingy.created_resource).not_to be_nil
           end
         end
@@ -794,21 +794,6 @@ describe "Recipe DSL methods" do
         end
       end
 
-      context "when Thingy9 provides :thingy9" do
-        before(:context) {
-          class RecipeDSLSpecNamespace::Thingy9 < BaseThingy
-            resource_name :thingy9
-          end
-        }
-
-        it "declaring a resource providing the same :thingy9 produces a warning" do
-          expect(Chef::Log).to receive(:warn).with("You declared a new resource RecipeDSLSpecNamespace::Thingy9AlternateProvider for resource thingy9, but it comes alphabetically after RecipeDSLSpecNamespace::Thingy9 and has the same filters ({}), so it will not be used. Use override: true if you want to use it for thingy9.")
-          class RecipeDSLSpecNamespace::Thingy9AlternateProvider < BaseThingy
-            resource_name :thingy9
-          end
-        end
-      end
-
       context "when Thingy10 provides :thingy10" do
         before(:context) {
           class RecipeDSLSpecNamespace::Thingy10 < BaseThingy

data/spec/integration/recipes/remote_directory.rb

@@ -0,0 +1,74 @@
+require 'support/shared/integration/integration_helper'
+
+describe Chef::Resource::RemoteDirectory do
+  include IntegrationSupport
+  include Chef::Mixin::ShellOut
+
+  # Until Cheffish::RSpec has cookbook support, we have to run the whole client
+  let(:chef_dir) { File.join(File.dirname(__FILE__), "..", "..", "..", "bin") }
+
+  # Invoke `chef-client` as `ruby PATH/TO/chef-client`. This ensures the
+  # following constraints are satisfied:
+  # * Windows: windows can only run batch scripts as bare executables. Rubygems
+  # creates batch wrappers for installed gems, but we don't have batch wrappers
+  # in the source tree.
+  # * Other `chef-client` in PATH: A common case is running the tests on a
+  # machine that has omnibus chef installed. In that case we need to ensure
+  # we're running `chef-client` from the source tree and not the external one.
+  # cf. CHEF-4914
+  let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
+
+  when_the_repository "has a cookbook with a source_dir with two subdirectories, each with one file and subdir in a different alphabetical order" do
+    before do
+      file 'config/client.rb', <<-EOM
+        local_mode true
+        cookbook_path "#{path_to('cookbooks')}"
+      EOM
+      directory "cookbooks/test" do
+        directory "files/default/source_dir" do
+          directory "sub1" do
+            file "aaa", ""
+            file "zzz/file", ""
+          end
+          directory "sub2" do
+            file "aaa/file", ""
+            file "zzz", ""
+          end
+        end
+      end
+    end
+
+    context "and a recipe is run with a remote_directory that syncs source_dir with different mode and file_mode" do
+      let!(:dest_dir) { path_to("dest_dir") }
+      before do
+        directory "cookbooks/test" do
+          file "recipes/default.rb", <<-EOM
+             remote_directory #{dest_dir.inspect} do
+               source "source_dir"
+               mode "0754"
+               files_mode 0777
+             end
+          EOM
+        end
+        shell_out!("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'test::default'", :cwd => chef_dir)
+      end
+
+      def mode_of(path)
+        path = path_to(path)
+        stat = File.stat(path)
+        (stat.mode & 0777).to_s(8)
+      end
+
+      it "creates all directories and files with the correct permissions" do
+        expect(mode_of("dest_dir/sub1")).to eq "754"
+        expect(mode_of("dest_dir/sub1/aaa")).to eq "777"
+        expect(mode_of("dest_dir/sub1/zzz")).to eq "754"
+        expect(mode_of("dest_dir/sub1/zzz/file")).to eq "777"
+        expect(mode_of("dest_dir/sub2")).to eq "754"
+        expect(mode_of("dest_dir/sub2/aaa")).to eq "754"
+        expect(mode_of("dest_dir/sub2/aaa/file")).to eq "777"
+        expect(mode_of("dest_dir/sub2/zzz")).to eq "777"
+      end
+    end
+  end
+end