chef 12.13.37 → 12.14.60

data/spec/functional/resource/user/dscl_spec.rb

@@ -76,7 +76,7 @@ describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metada
   let(:iterations) { nil }
 
   let(:user_resource) do
-    r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
+    r = Chef::Resource::User::DsclUser.new("TEST USER RESOURCE", run_context)
     r.username(username)
     r.uid(uid)
     r.gid(gid)
@@ -123,7 +123,7 @@ describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metada
   end
 
   describe "when password is being set via shadow hash" do
-    let(:password) {
+    let(:password) do
       if node[:platform_version].start_with?("10.7.")
         # On Mac 10.7 we only need to set the password
         "c9b3bd1a0cde797eef0eff16c580dab996ba3a21961cccc\
@@ -139,7 +139,7 @@ b1d4880833aa7a190afc13e2bf0936b8\
 c5adbbac718b7eb99463a7b679571e0f\
 1c9fef2ef08d0b9e9c2bcf644eed2ffc"
       end
-    }
+    end
 
     let(:iterations) { 25000 }
     let(:salt) { "9e2e7d5ee473b496fd24cf0bbfcaedfcb291ee21740e570d1e917e874f8788ca" }

data/spec/functional/resource/user/useradd_spec.rb

@@ -21,19 +21,26 @@ require "spec_helper"
 require "functional/resource/base"
 require "chef/mixin/shell_out"
 
-def user_provider_for_platform
-  case ohai[:platform]
+def resource_for_platform(username, run_context)
+  Chef::Resource.resource_for_node(:user, node).new(username, run_context)
+end
+
+# ideally we could somehow pass an array of [ ...::Aix, ...::Linux ] to the
+# filter, but we have to pick the right one for the O/S.
+def user_provider_filter
+  case ohai[:os]
   when "aix"
     Chef::Provider::User::Aix
-  else
-    Chef::Provider::User::Useradd
+  when "linux"
+    Chef::Provider::User::Linux
   end
 end
 
-metadata = { :unix_only => true,
-             :requires_root => true,
-             :not_supported_on_mac_osx => true,
-             :provider => { :user => user_provider_for_platform },
+metadata = {
+  :unix_only => true,
+  :requires_root => true,
+  :not_supported_on_mac_osx => true,
+  :provider => { :user => user_provider_filter },
 }
 
 describe Chef::Provider::User::Useradd, metadata do
@@ -81,12 +88,13 @@ describe Chef::Provider::User::Useradd, metadata do
   end
 
   def try_cleanup
-    ["/home/cheftestfoo", "/home/cheftestbar"].each do |f|
+    ["/home/cheftestfoo", "/home/cheftestbar", "/home/cf-test"].each do |f|
       FileUtils.rm_rf(f) if File.exists? f
     end
 
     ["cf-test"].each do |u|
-      r = Chef::Resource::User.new("DELETE USER", run_context)
+      r = resource_for_platform("DELETE USER", run_context)
+      r.manage_home true
       r.username("cf-test")
       r.run_action(:remove)
     end
@@ -134,10 +142,7 @@ describe Chef::Provider::User::Useradd, metadata do
     Chef::RunContext.new(node, {}, events)
   end
 
-  let(:username) do
-    "cf-test"
-  end
-
+  let(:username) { "cf-test" }
   let(:uid) { nil }
   let(:home) { nil }
   let(:manage_home) { false }
@@ -146,7 +151,7 @@ describe Chef::Provider::User::Useradd, metadata do
   let(:comment) { nil }
 
   let(:user_resource) do
-    r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
+    r = resource_for_platform("TEST USER RESOURCE", run_context)
     r.username(username)
     r.uid(uid)
     r.home(home)
@@ -242,15 +247,8 @@ describe Chef::Provider::User::Useradd, metadata do
           expect(pw_entry.home).to eq(home)
         end
 
-        if %w{rhel fedora wrlinux}.include?(OHAI_SYSTEM["platform_family"])
-          # Inconsistent behavior. See: CHEF-2205
-          it "creates the home dir when not explicitly asked to on RHEL (XXX)" do
-            expect(File).to exist(home)
-          end
-        else
-          it "does not create the home dir without `manage_home'" do
-            expect(File).not_to exist(home)
-          end
+        it "does not create the home dir without `manage_home'" do
+          expect(File).not_to exist(home)
         end
 
         context "and manage_home is enabled" do
@@ -260,6 +258,14 @@ describe Chef::Provider::User::Useradd, metadata do
             expect(File).to exist(home)
           end
         end
+
+        context "and manage_home is the default" do
+          let(:manage_home) { nil }
+
+          it "does not create the home dir without `manage_home'" do
+            expect(File).not_to exist(home)
+          end
+        end
       end
 
       context "when a password is specified" do
@@ -310,8 +316,8 @@ describe Chef::Provider::User::Useradd, metadata do
       let(:existing_comment) { nil }
 
       let(:existing_user) do
-        r = Chef::Resource::User.new("TEST USER RESOURCE", run_context)
-        # username is identity attr, must match.
+        r = resource_for_platform("TEST USER RESOURCE", run_context)
+          # username is identity attr, must match.
         r.username(username)
         r.uid(existing_uid)
         r.home(existing_home)

data/spec/functional/resource/windows_service_spec.rb

@@ -27,19 +27,19 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
   let(:qualified_username) { "#{ENV['COMPUTERNAME']}\\#{username}" }
   let(:password) { "1a2b3c4X!&narf" }
 
-  let(:user_resource) {
-    r = Chef::Resource::User.new(username, run_context)
+  let(:user_resource) do
+    r = Chef::Resource::User::WindowsUser.new(username, run_context)
     r.username(username)
     r.password(password)
     r.comment("temp spec user")
     r
-  }
+  end
 
-  let(:global_service_file_path) {
+  let(:global_service_file_path) do
     "#{ENV['WINDIR']}\\temp\\#{File.basename(test_service[:service_file_path])}"
-  }
+  end
 
-  let(:service_params) {
+  let(:service_params) do
 
     id = "#{$$}_#{rand(1000)}"
 
@@ -51,19 +51,19 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
       service_description: "Test service for running the windows_service functional spec.",
       service_file_path: global_service_file_path,
       } )
-  }
+  end
 
-  let(:manager) {
+  let(:manager) do
     Chef::Application::WindowsServiceManager.new(service_params)
-  }
+  end
 
-  let(:service_resource) {
+  let(:service_resource) do
     r = Chef::Resource::WindowsService.new(service_params[:service_name], run_context)
     [:run_as_user, :run_as_password].each { |prop| r.send(prop, service_params[prop]) }
     r
-  }
+  end
 
-  before {
+  before do
     user_resource.run_action(:create)
 
     # the service executable has to be outside the current user's home
@@ -81,13 +81,13 @@ describe Chef::Resource::WindowsService, :windows_only, :system_windows_service_
     file.run_action(:create)
 
     manager.run(%w{--action install})
-  }
+  end
 
-  after {
+  after do
     user_resource.run_action(:remove)
     manager.run(%w{--action uninstall})
     File.delete(global_service_file_path)
-  }
+  end
 
   describe "logon as a service" do
     it "successfully runs a service as another user" do

data/spec/functional/rest_spec.rb

@@ -83,11 +83,11 @@ describe Chef::REST do
     Chef::Config[:treat_deprecation_warnings_as_errors] = false
   end
 
-  before(:all) do
+  before(:each) do
     start_tiny_server
   end
 
-  after(:all) do
+  after(:each) do
     stop_tiny_server
   end
 

data/spec/functional/run_lock_spec.rb

@@ -46,11 +46,9 @@ describe Chef::RunLock do
     end
 
     WAIT_ON_LOCK_TIME = 1.0
-    def wait_on_lock
+    def wait_on_lock(from_fork)
       Timeout.timeout(WAIT_ON_LOCK_TIME) do
-        until File.exist?(lockfile)
-          sleep 0.1
-        end
+        from_fork.readline
       end
     rescue Timeout::Error
       raise "Lockfile never created, abandoning test"
@@ -259,14 +257,16 @@ describe Chef::RunLock do
     it "test returns true and acquires the lock" do
       run_lock = Chef::RunLock.new(lockfile)
       from_tests, to_fork = IO.pipe
+      from_fork, to_tests = IO.pipe
       p1 = fork do
         expect(run_lock.test).to eq(true)
+        to_tests.puts "lock acquired"
         # Wait for the test to tell us we can exit before exiting
         from_tests.readline
         exit! 0
       end
 
-      wait_on_lock
+      wait_on_lock(from_fork)
 
       p2 = fork do
         expect(run_lock.test).to eq(false)
@@ -283,14 +283,16 @@ describe Chef::RunLock do
     it "test returns without waiting when the lock is acquired" do
       run_lock = Chef::RunLock.new(lockfile)
       from_tests, to_fork = IO.pipe
+      from_fork, to_tests = IO.pipe
       p1 = fork do
         run_lock.acquire
+        to_tests.puts "lock acquired"
         # Wait for the test to tell us we can exit before exiting
         from_tests.readline
         exit! 0
       end
 
-      wait_on_lock
+      wait_on_lock(from_fork)
       expect(run_lock.test).to eq(false)
 
       to_fork.puts "you can exit now"
@@ -393,9 +395,7 @@ describe Chef::RunLock do
           # Send it the kill signal over and over until it dies
           Timeout.timeout(CLIENT_PROCESS_TIMEOUT) do
             Process.kill(:KILL, pid)
-            until Process.waitpid2(pid, Process::WNOHANG)
-              sleep(0.05)
-            end
+            sleep(0.05) until Process.waitpid2(pid, Process::WNOHANG)
           end
           example.log_event("#{name}.stop finished (stopped pid #{pid})")
         # Process not found is perfectly fine when we're trying to kill a process :)

data/spec/functional/tiny_server_spec.rb

@@ -65,14 +65,15 @@ end
 
 describe TinyServer::Manager do
   it "runs the server" do
-    @server = TinyServer::Manager.new
-    @server.start
+    server = TinyServer::Manager.new
+    server.start
+    begin
+      TinyServer::API.instance.get("/index", 200, "[\"hello\"]")
 
-    TinyServer::API.instance.get("/index", 200, "[\"hello\"]")
-
-    rest = Chef::HTTP.new("http://localhost:9000")
-    expect(rest.get("index")).to eq("[\"hello\"]")
-
-    @server.stop
+      rest = Chef::HTTP.new("http://localhost:9000")
+      expect(rest.get("index")).to eq("[\"hello\"]")
+    ensure
+      server.stop
+    end
   end
 end

data/spec/functional/win32/crypto_spec.rb

@@ -22,7 +22,7 @@ if Chef::Platform.windows?
 end
 
 describe "Chef::ReservedNames::Win32::Crypto", :windows_only do
-  describe '#encrypt' do
+  describe "#encrypt" do
     before(:all) do
       new_node = Chef::Node.new
       new_node.consume_external_attrs(OHAI_SYSTEM.data, {})

data/spec/functional/win32/security_spec.rb

@@ -45,27 +45,27 @@ describe "Chef::Win32::Security", :windows_only do
   end
 
   describe "access_check" do
-    let(:security_descriptor) {
+    let(:security_descriptor) do
       Chef::ReservedNames::Win32::Security.get_file_security(
         "C:\\Program Files")
-    }
+    end
 
     let(:token_rights) { Chef::ReservedNames::Win32::Security::TOKEN_ALL_ACCESS }
 
-    let(:token) {
+    let(:token) do
       Chef::ReservedNames::Win32::Security.open_process_token(
         Chef::ReservedNames::Win32::Process.get_current_process,
         token_rights).duplicate_token(:SecurityImpersonation)
-    }
+    end
 
-    let(:mapping) {
+    let(:mapping) do
       mapping = Chef::ReservedNames::Win32::Security::GENERIC_MAPPING.new
       mapping[:GenericRead] = Chef::ReservedNames::Win32::Security::FILE_GENERIC_READ
       mapping[:GenericWrite] = Chef::ReservedNames::Win32::Security::FILE_GENERIC_WRITE
       mapping[:GenericExecute] = Chef::ReservedNames::Win32::Security::FILE_GENERIC_EXECUTE
       mapping[:GenericAll] = Chef::ReservedNames::Win32::Security::FILE_ALL_ACCESS
       mapping
-    }
+    end
 
     let(:desired_access) { Chef::ReservedNames::Win32::Security::FILE_GENERIC_READ }
 
@@ -76,11 +76,11 @@ describe "Chef::Win32::Security", :windows_only do
   end
 
   describe "Chef::Win32::Security::Token" do
-    let(:token) {
+    let(:token) do
       Chef::ReservedNames::Win32::Security.open_process_token(
         Chef::ReservedNames::Win32::Process.get_current_process,
         token_rights)
-    }
+    end
     context "with all rights" do
       let(:token_rights) { Chef::ReservedNames::Win32::Security::TOKEN_ALL_ACCESS }
 

data/spec/integration/client/client_spec.rb

@@ -19,11 +19,11 @@ describe "chef-client" do
     #
     # just a normal file
     # (expected_content should be uncompressed)
-    @api.get("/recipes.tgz", 200) {
+    @api.get("/recipes.tgz", 200) do
       File.open(recipes_filename, "rb") do |f|
         f.read
       end
-    }
+    end
   end
 
   def stop_tiny_server
@@ -376,6 +376,8 @@ EOM
     end
 
     it "the cheffish DSL tries to load but fails (because chef-provisioning is not there)" do
+      # we'd need to have a custom bundle to fix this that omitted chef-provisioning, but that would dig our crazy even deeper, so lets not
+      skip "but if chef-provisioning is in our bundle or in our gemset then this test, very annoyingly, always fails"
       command = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
       expect(command.exitstatus).to eql(1)
       expect(command.stdout).to match(/cannot load such file -- chef\/provisioning/)
@@ -474,11 +476,11 @@ end
 
   # Fails on appveyor, but works locally on windows and on windows hosts in Ci.
   context "when using recipe-url", :skip_appveyor do
-    before(:all) do
+    before(:each) do
       start_tiny_server
     end
 
-    after(:all) do
+    after(:each) do
       stop_tiny_server
     end
 

data/spec/integration/knife/chef_repo_path_spec.rb

@@ -48,7 +48,7 @@ describe "chef_repo_path tests", :workstation do
 
         directory "chef_repo2" do
           file "clients/client3.json", {}
-          file "cookbooks/cookbook3/metadata.rb", ""
+          file "cookbooks/cookbook3/metadata.rb", "name 'cookbook3'"
           file "data_bags/bag3/item3.json", {}
           file "environments/env3.json", {}
           file "nodes/node3.json", {}
@@ -79,6 +79,75 @@ describe "chef_repo_path tests", :workstation do
 EOM
       end
 
+      it "knife list --local -Rfp --chef-repo-path chef_r~1 / grabs chef_repo2 stuff", :windows_only do
+        Chef::Config.delete(:chef_repo_path)
+        knife("list --local -Rfp --chef-repo-path #{path_to('chef_r~1')} /").should_succeed <<EOM
+/clients/
+/clients/client3.json
+/cookbooks/
+/cookbooks/cookbook3/
+/cookbooks/cookbook3/metadata.rb
+/data_bags/
+/data_bags/bag3/
+/data_bags/bag3/item3.json
+/environments/
+/environments/env3.json
+/nodes/
+/nodes/node3.json
+/roles/
+/roles/role3.json
+/users/
+/users/user3.json
+EOM
+      end
+
+      it "knife list --local -Rfp --chef-repo-path chef_r~1 / grabs chef_repo2 stuff", :windows_only do
+        Chef::Config.delete(:chef_repo_path)
+        knife("list -z -Rfp --chef-repo-path #{path_to('chef_r~1')} /").should_succeed <<EOM
+/acls/
+/acls/clients/
+/acls/clients/client3.json
+/acls/containers/
+/acls/cookbook_artifacts/
+/acls/cookbooks/
+/acls/cookbooks/cookbook3.json
+/acls/data_bags/
+/acls/data_bags/bag3.json
+/acls/environments/
+/acls/environments/env3.json
+/acls/groups/
+/acls/nodes/
+/acls/nodes/node3.json
+/acls/organization.json
+/acls/policies/
+/acls/policy_groups/
+/acls/roles/
+/acls/roles/role3.json
+/clients/
+/clients/client3.json
+/containers/
+/cookbook_artifacts/
+/cookbooks/
+/cookbooks/cookbook3/
+/cookbooks/cookbook3/metadata.rb
+/data_bags/
+/data_bags/bag3/
+/data_bags/bag3/item3.json
+/environments/
+/environments/env3.json
+/groups/
+/invitations.json
+/members.json
+/nodes/
+/nodes/node3.json
+/org.json
+/policies/
+/policy_groups/
+/roles/
+/roles/role3.json
+EOM
+      end
+
       context "when all _paths are set to alternates" do
         before :each do
           %w{client cookbook data_bag environment node role user}.each do |object_name|