summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Mundrawala <jdmundrawala@gmail.com>2014-12-18 13:44:47 -0800
committerJay Mundrawala <jdmundrawala@gmail.com>2014-12-18 13:44:47 -0800
commita7f7bca284ec9d99ed074950a18a62aeb41d3f70 (patch)
tree40602e783cb051fcea2cb3fc0a463032b8d40696
parent399674d53dfb15c731915ea6d95749774e19876c (diff)
downloadchef-jdm/disable-execute-timeout-win.tar.gz
Execute spec should actually check to make sure it did not wait for 600 secondsjdm/disable-execute-timeout-win
-rw-r--r--spec/functional/resource/execute_spec.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/spec/functional/resource/execute_spec.rb b/spec/functional/resource/execute_spec.rb
index cebcc52fcf..020814fcd6 100644
--- a/spec/functional/resource/execute_spec.rb
+++ b/spec/functional/resource/execute_spec.rb
@@ -18,6 +18,7 @@
require 'spec_helper'
require 'functional/resource/base'
+require 'timeout'
describe Chef::Resource::Execute do
let(:resource) {
@@ -111,8 +112,10 @@ describe Chef::Resource::Execute do
end
it "times out when a timeout is set on the resource" do
- resource.command %{ruby -e 'sleep 600'}
- resource.timeout 0.1
- expect { resource.run_action(:run) }.to raise_error(Mixlib::ShellOut::CommandTimeout)
+ Timeout::timeout(5) do
+ resource.command %{ruby -e 'sleep 600'}
+ resource.timeout 0.1
+ expect { resource.run_action(:run) }.to raise_error(Mixlib::ShellOut::CommandTimeout)
+ end
end
end