summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaire McQuin <claire@getchef.com>2014-10-01 14:30:33 -0700
committerClaire McQuin <claire@getchef.com>2014-10-01 14:31:06 -0700
commit29af25f00ce95ef93c81fd5292adadbcd9cac20d (patch)
tree5ce06663e2cb5191cee6be2a945e210fa38fb7bc
parente2cedf758f3c78ac8badb336d5021144bcd7b469 (diff)
downloadchef-29af25f00ce95ef93c81fd5292adadbcd9cac20d.tar.gz
Test signal safely on windowsmcquin/Issue-1910
-rw-r--r--lib/chef/application/client.rb2
-rw-r--r--spec/unit/application/client_spec.rb1
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/application/client.rb b/lib/chef/application/client.rb
index cc734732bb..7f0a39782a 100644
--- a/lib/chef/application/client.rb
+++ b/lib/chef/application/client.rb
@@ -363,7 +363,7 @@ class Chef::Application::Client < Chef::Application
end
def test_signal
- client_sleep(0)
+ @signal = interval_sleep(0)
end
def time_to_sleep
diff --git a/spec/unit/application/client_spec.rb b/spec/unit/application/client_spec.rb
index 1ff82453bf..ee91e67256 100644
--- a/spec/unit/application/client_spec.rb
+++ b/spec/unit/application/client_spec.rb
@@ -286,6 +286,7 @@ describe Chef::Application::Client, "run_application", :unix_only do
end
it "shouldn't sleep when sent USR1" do
+ @app.stub(:interval_sleep).with(0).and_call_original
pid = fork do
@app.run_application
end