summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorLamont Granquist <lamont@scriptkiddie.org>2018-01-23 12:11:01 -0800
committerGitHub <noreply@github.com>2018-01-23 12:11:01 -0800
commit9f78fdbdbdf43659ce2c13f2838e7db2178c5726 (patch)
treef94decb6f0e62000309b4461dcf742f220731304 /spec
parenta7202f77460729090f95e4ff995f4ab1c0898bba (diff)
downloadchef-9f78fdbdbdf43659ce2c13f2838e7db2178c5726.tar.gz
Revert "Fail on interval runs on windows"
Diffstat (limited to 'spec')
-rw-r--r--spec/unit/application/client_spec.rb6
-rw-r--r--spec/unit/application/solo_spec.rb4
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index 4f1558267e..825a4e7aac 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -1,6 +1,6 @@
#
# Author:: AJ Christensen (<aj@junglist.gen.nz>)
-# Copyright:: Copyright 2008-2018, Chef Software Inc.
+# Copyright:: Copyright 2008-2016, Chef Software Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -209,8 +209,8 @@ Enable chef-client interval runs by setting `:client_fork = true` in your config
allow(ChefConfig).to receive(:windows?).and_return(true)
end
- it "should terminate" do
- expect(Chef::Application).to receive(:fatal!)
+ it "should not terminate" do
+ expect(Chef::Application).not_to receive(:fatal!)
app.reconfigure
end
end
diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb
index f613cd956d..5b9dbeaafd 100644
--- a/spec/unit/application/solo_spec.rb
+++ b/spec/unit/application/solo_spec.rb
@@ -69,10 +69,10 @@ describe Chef::Application::Solo do
it "should terminate with message" do
expect(Chef::Application).to receive(:fatal!).with(
- "Unforked chef-solo interval runs are disabled in Chef 12.
+ "Unforked chef-client interval runs are disabled in Chef 12.
Configuration settings:
interval = 600 seconds
-Enable chef-solo interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
+Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options."
)
app.reconfigure
end