diff options
| author | Tim Smith <tsmith@chef.io> | 2019-05-02 20:33:21 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2019-05-02 20:33:21 -0700 |
| commit | 21dae573adc3989ae1c7a0d6a0cebce41b84e483 (patch) | |
| tree | c3ed838342c5d01b83443e7b21a19991e998afe4 | |
| parent | b9ad8858e5e147e8c18cc57ebc152923368af141 (diff) | |
| download | chef-21dae573adc3989ae1c7a0d6a0cebce41b84e483.tar.gz | |
Update specs for the new messages
Signed-off-by: Tim Smith <tsmith@chef.io>
| -rw-r--r-- | lib/chef/application/solo.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/client_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/exit_code_spec.rb | 2 | ||||
| -rw-r--r-- | spec/unit/application/solo_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/lib/chef/application/solo.rb b/lib/chef/application/solo.rb index c1042937cc..04cc9265ff 100644 --- a/lib/chef/application/solo.rb +++ b/lib/chef/application/solo.rb @@ -366,7 +366,7 @@ class Chef::Application::Solo < Chef::Application end def unforked_interval_error_message - "Unforked #{Chef::Dist::CLIENT} interval runs are disabled bvy default." + + "Unforked #{Chef::Dist::CLIENT} interval runs are disabled by default." + "\nConfiguration settings:" + ("\n interval = #{Chef::Config[:interval]} seconds" if Chef::Config[:interval]).to_s + "\nEnable #{Chef::Dist::CLIENT} interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb index 8daba1d660..df1b6c99e2 100644 --- a/spec/unit/application/client_spec.rb +++ b/spec/unit/application/client_spec.rb @@ -326,7 +326,7 @@ describe Chef::Application::Client, "reconfigure" do Chef::Config[:interval] = 600 allow(ChefConfig).to receive(:windows?).and_return(false) expect(Chef::Application).to receive(:fatal!).with( - /Unforked .* interval runs are disabled in .* 12\. + /Unforked .* interval runs are disabled by default\. Configuration settings: interval = 600 seconds Enable .* interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options\./ diff --git a/spec/unit/application/exit_code_spec.rb b/spec/unit/application/exit_code_spec.rb index e8a0072ff3..6800ad0de5 100644 --- a/spec/unit/application/exit_code_spec.rb +++ b/spec/unit/application/exit_code_spec.rb @@ -70,7 +70,7 @@ describe Chef::Application::ExitCode do it "does write a warning on non-standard exit codes" do expect(Chef::Log).to receive(:warn).with( - /^Chef attempted to exit with a non-standard exit code of 151/) + /attempted to exit with a non-standard exit code of 151/) expect(exit_codes.normalize_exit_code(151)).to eq(1) end diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb index 1a4961f025..74f71a9115 100644 --- a/spec/unit/application/solo_spec.rb +++ b/spec/unit/application/solo_spec.rb @@ -64,7 +64,7 @@ describe Chef::Application::Solo do it "should terminate with message" do expect(Chef::Application).to receive(:fatal!).with( - /Unforked .* interval runs are disabled in .* 12\. + /Unforked .* interval runs are disabled by default\. Configuration settings: interval = 600 seconds Enable .* interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options\./ |