diff options
Diffstat (limited to 'spec/integration/solo/solo_spec.rb')
| -rw-r--r-- | spec/integration/solo/solo_spec.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/integration/solo/solo_spec.rb b/spec/integration/solo/solo_spec.rb index f142798546..7daa87d2f0 100644 --- a/spec/integration/solo/solo_spec.rb +++ b/spec/integration/solo/solo_spec.rb @@ -125,7 +125,7 @@ file_cache_path "#{path_to('config/cache')}" EOM # We have a timeout protection here so that if due to some bug # run_lock gets stuck we can discover it. - expect { + expect do Timeout.timeout(120) do chef_dir = File.join(File.dirname(__FILE__), "..", "..", "..") @@ -143,7 +143,7 @@ EOM Process.waitpid(s1) Process.waitpid(s2) end - }.not_to raise_error + end.not_to raise_error # Unfortunately file / directory helpers in integration tests # are implemented using before(:each) so we need to do all below |