summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTim Smith <tsmith84@gmail.com>2020-08-27 16:13:40 -0700
committerTim Smith <tsmith84@gmail.com>2020-08-27 16:13:40 -0700
commit1ebf2e1f232af535ff2c4cb78579de62707362cb (patch)
treedc163b7d8364f0c208cd4936e7e828b311ba15db /spec
parent20ce378890ca7991a23391000d6f7135a2c52841 (diff)
downloadchef-1ebf2e1f232af535ff2c4cb78579de62707362cb.tar.gz
Use bash to run sleep/chef-client in chef_client_launchdclient_updates
My googling tells me this is the recommended way to run multiple commands. Signed-off-by: Tim Smith <tsmith@chef.io>
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/resource/chef_client_launchd_spec.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/spec/unit/resource/chef_client_launchd_spec.rb b/spec/unit/resource/chef_client_launchd_spec.rb
index 1d66da3e39..1d0015cb0d 100644
--- a/spec/unit/resource/chef_client_launchd_spec.rb
+++ b/spec/unit/resource/chef_client_launchd_spec.rb
@@ -91,28 +91,28 @@ describe Chef::Resource::ChefClientLaunchd do
it "creates a valid command if using all default properties" do
expect(provider.client_command).to eql(
- ["/bin/sleep", "123;", "/opt/chef/bin/chef-client", "-c", root_path, "-L", "/Library/Logs/Chef/client.log"]
+ "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /Library/Logs/Chef/client.log"
)
end
it "adds custom daemon options from daemon_options property" do
resource.daemon_options %w{foo bar}
expect(provider.client_command).to eql(
- ["/bin/sleep", "123;", "/opt/chef/bin/chef-client", "foo", "bar", "-c", root_path, "-L", "/Library/Logs/Chef/client.log"]
+ "/bin/sleep 123; /opt/chef/bin/chef-client foo bar -c #{root_path} -L /Library/Logs/Chef/client.log"
)
end
it "adds license acceptance flags if the property is set" do
resource.accept_chef_license true
expect(provider.client_command).to eql(
- ["/bin/sleep", "123;", "/opt/chef/bin/chef-client", "-c", root_path, "-L", "/Library/Logs/Chef/client.log", "--chef-license", "accept"]
+ "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /Library/Logs/Chef/client.log --chef-license accept"
)
end
it "uses custom config dir if set" do
resource.config_directory "/etc/some_other_dir"
expect(provider.client_command).to eql(
- ["/bin/sleep", "123;", "/opt/chef/bin/chef-client", "-c", "/etc/some_other_dir/client.rb", "-L", "/Library/Logs/Chef/client.log"]
+ "/bin/sleep 123; /opt/chef/bin/chef-client -c /etc/some_other_dir/client.rb -L /Library/Logs/Chef/client.log"
)
end
@@ -120,7 +120,7 @@ describe Chef::Resource::ChefClientLaunchd do
resource.log_file_name "my-client.log"
resource.log_directory "/var/log/my-chef/"
expect(provider.client_command).to eql(
- ["/bin/sleep", "123;", "/opt/chef/bin/chef-client", "-c", root_path, "-L", "/var/log/my-chef/my-client.log"]
+ "/bin/sleep 123; /opt/chef/bin/chef-client -c #{root_path} -L /var/log/my-chef/my-client.log"
)
end
end