diff options
author | Thom May <thom@may.lt> | 2018-01-23 15:11:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-23 15:11:07 +0000 |
commit | 6799b40effa26bf378aeb7d82abea0c3445ce19e (patch) | |
tree | 7ca8f62547c2c197a82f49a299d3761358279588 /spec | |
parent | 01dd481594a2d89b850bfc941c7483a1ecca7070 (diff) | |
parent | dedb5670db29b7f6bedb037888d5a4b3bcd6ff83 (diff) | |
download | chef-6799b40effa26bf378aeb7d82abea0c3445ce19e.tar.gz |
Merge pull request #6766 from chef/lcg/windows-interval
Fail on interval runs on windows
Diffstat (limited to 'spec')
-rw-r--r-- | spec/unit/application/client_spec.rb | 6 | ||||
-rw-r--r-- | spec/unit/application/solo_spec.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb index 825a4e7aac..4f1558267e 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-2016, Chef Software Inc. +# Copyright:: Copyright 2008-2018, 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 not terminate" do - expect(Chef::Application).not_to receive(:fatal!) + it "should terminate" do + expect(Chef::Application).to receive(:fatal!) app.reconfigure end end diff --git a/spec/unit/application/solo_spec.rb b/spec/unit/application/solo_spec.rb index 5b9dbeaafd..f613cd956d 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-client interval runs are disabled in Chef 12. + "Unforked chef-solo interval runs are disabled in Chef 12. Configuration settings: interval = 600 seconds -Enable chef-client interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." +Enable chef-solo interval runs by setting `:client_fork = true` in your config file or adding `--fork` to your command line options." ) app.reconfigure end |