summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavin Taddeo <davin@chef.io>2020-06-03 14:57:53 -0400
committerDavin Taddeo <davin@chef.io>2020-06-03 14:57:53 -0400
commitcc35e6bafa4ce87e3fbe80d8c4561a0fe6e0f425 (patch)
treeeed87822f3669b01cf8d01c6ae0dd7a8ac30feeb
parentf43db02979505948250921045e167db5caa3c4ec (diff)
downloadchef-cc35e6bafa4ce87e3fbe80d8c4561a0fe6e0f425.tar.gz
Modify my fixes for the windows unit tests so that I don't break all the Linux unit tests...
Signed-off-by: Davin Taddeo <davin@chef.io>
-rw-r--r--spec/unit/resource/chef_client_scheduled_task_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/unit/resource/chef_client_scheduled_task_spec.rb b/spec/unit/resource/chef_client_scheduled_task_spec.rb
index 0dc6b7fbe3..7d23038f7c 100644
--- a/spec/unit/resource/chef_client_scheduled_task_spec.rb
+++ b/spec/unit/resource/chef_client_scheduled_task_spec.rb
@@ -80,12 +80,12 @@ describe Chef::Resource::ChefClientScheduledTask do
describe "#client_cmd" do
it "creates a valid command if using all default properties" do
- expect(provider.client_cmd).to eql("/opt/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb")
+ expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb")
end
it "uses daemon_options if set" do
resource.daemon_options ["--foo 1", "--bar 2"]
- expect(provider.client_cmd).to eql("/opt/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --foo 1 --bar 2") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb --foo 1 --bar 2")
+ expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --foo 1 --bar 2") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb --foo 1 --bar 2")
end
it "uses custom config dir if set" do
@@ -96,7 +96,7 @@ describe Chef::Resource::ChefClientScheduledTask do
it "uses custom log files / paths if set" do
resource.log_file_name "my-client.log"
resource.log_directory "C:/foo/bar"
- expect(provider.client_cmd).to eql("/opt/opscode/chef/bin/chef-client -L C:/foo/bar/my-client.log -c /etc/chef/client.rb") | eql("C:/opscode/chef/bin/chef-client -L C:/foo/bar/my-client.log -c C:\\chef/client.rb")
+ expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L C:/foo/bar/my-client.log -c /etc/chef/client.rb") | eql("C:/opscode/chef/bin/chef-client -L C:/foo/bar/my-client.log -c C:\\chef/client.rb")
end
it "uses custom chef-client binary if set" do
@@ -106,7 +106,7 @@ describe Chef::Resource::ChefClientScheduledTask do
it "sets the license acceptance flag if set" do
resource.accept_chef_license true
- expect(provider.client_cmd).to eql("/opt/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --chef-license accept") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb --chef-license accept")
+ expect(provider.client_cmd).to eql("C:/opscode/chef/bin/chef-client -L /etc/chef/log/client.log -c /etc/chef/client.rb --chef-license accept") | eql("C:/opscode/chef/bin/chef-client -L C:\\chef/log/client.log -c C:\\chef/client.rb --chef-license accept")
end
end
end