Do not require client_key to be specified for chef-client when chef-zero is enabled

1 files changed, 4 insertions, 12 deletions

diff --git a/spec/integration/client/client_spec.rb b/spec/integration/client/client_spec.rb
index 522ee8da8b..875732791e 100644
--- a/spec/integration/client/client_spec.rb
+++ b/spec/integration/client/client_spec.rb
@@ -11,8 +11,6 @@ describe "chef-client" do
     it "should complete with success" do
       file 'config/client.rb', <<EOM
 chef_zero.enabled true
-client_key "#{path_to('config/client.pem')}"
-validation_key nil
 cookbook_path "#{path_to('cookbooks')}"
 checksum_path "#{path_to('config/checksums')}"
 file_cache_path "#{path_to('config/cache')}"
@@ -20,15 +18,13 @@ file_backup_path "#{path_to('config/backup')}"
 EOM
 
       chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -l debug", :cwd => chef_dir)
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default'", :cwd => chef_dir)
       result.error!
     end
 
     it "should complete with success when passed the -z flag" do
       file 'config/client.rb', <<EOM
 chef_server_url 'http://omg.com/blah'
-client_key "#{path_to('config/client.pem')}"
-validation_key nil
 cookbook_path "#{path_to('cookbooks')}"
 checksum_path "#{path_to('config/checksums')}"
 file_cache_path "#{path_to('config/cache')}"
@@ -36,15 +32,13 @@ file_backup_path "#{path_to('config/backup')}"
 EOM
 
       chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -l debug -z", :cwd => chef_dir)
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
       result.error!
     end
 
     it "should complete with success when passed the --zero flag" do
       file 'config/client.rb', <<EOM
 chef_server_url 'http://omg.com/blah'
-client_key "#{path_to('config/client.pem')}"
-validation_key nil
 cookbook_path "#{path_to('cookbooks')}"
 checksum_path "#{path_to('config/checksums')}"
 file_cache_path "#{path_to('config/cache')}"
@@ -52,15 +46,13 @@ file_backup_path "#{path_to('config/backup')}"
 EOM
 
       chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -l debug --zero", :cwd => chef_dir)
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' --zero", :cwd => chef_dir)
       result.error!
     end
 
     it "should complete with success when passed -z and --chef-zero-port" do
       file 'config/client.rb', <<EOM
 chef_server_url 'http://omg.com/blah'
-client_key "#{path_to('config/client.pem')}"
-validation_key nil
 cookbook_path "#{path_to('cookbooks')}"
 checksum_path "#{path_to('config/checksums')}"
 file_cache_path "#{path_to('config/cache')}"
@@ -68,7 +60,7 @@ file_backup_path "#{path_to('config/backup')}"
 EOM
 
       chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..", "bin")
-      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -l debug -z", :cwd => chef_dir)
+      result = shell_out("chef-client -c \"#{path_to('config/client.rb')}\" -o 'x::default' -z", :cwd => chef_dir)
       result.error!
     end
   end