diff options
author | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-01-12 08:55:18 -0800 |
---|---|---|
committer | Jay Mundrawala <jdmundrawala@gmail.com> | 2015-01-12 08:55:18 -0800 |
commit | 55cdb2c6fa2f0e8a7da074862f95590f088719a2 (patch) | |
tree | 1339f87cf03996102e4218acb9df2c763db6daaf | |
parent | 4dda161d7afa3887f4910b948f677a074ab58a56 (diff) | |
parent | a7f7bca284ec9d99ed074950a18a62aeb41d3f70 (diff) | |
download | chef-55cdb2c6fa2f0e8a7da074862f95590f088719a2.tar.gz |
Merge pull request #2686 from opscode/jdm/disable-execute-timeout-win
Fail execute test if it takes too long
-rw-r--r-- | spec/functional/resource/execute_spec.rb | 9 |
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 |