diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2015-12-11 12:25:45 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2015-12-11 12:25:45 -0800 |
| commit | a8c2fb3e7e30fae882693253fd699f2b1bab185c (patch) | |
| tree | 70386a4e9018e7157d1b1590701aef4571c7a251 /spec | |
| parent | 7bcd87fa3256d5b8a6e669975d632eb60003426c (diff) | |
| parent | 8ff1e031d48a9b1588aaa6beadb38fcd7cb7c13d (diff) | |
| download | chef-a8c2fb3e7e30fae882693253fd699f2b1bab185c.tar.gz | |
Merge pull request #4286 from chef/lcg/bump-timeout-for-travis
bump up timeout for travis
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/shared/integration/app_server_support.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/support/shared/integration/app_server_support.rb b/spec/support/shared/integration/app_server_support.rb index a0d5e7fa5c..0ca6c54ede 100644 --- a/spec/support/shared/integration/app_server_support.rb +++ b/spec/support/shared/integration/app_server_support.rb @@ -1,7 +1,7 @@ # # Author:: John Keiser (<jkeiser@opscode.com>) # Author:: Ho-Sheng Hsiao (<hosh@opscode.com>) -# Copyright:: Copyright (c) 2012, 2013 Opscode, Inc. +# Copyright:: Copyright (c) 2012, 2013-2015 Chef Software, Inc. # License:: Apache License, Version 2.0 # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -32,7 +32,7 @@ module AppServerSupport server = found_server end end - Timeout::timeout(5) do + Timeout::timeout(30) do until server && server.status == :Running sleep(0.01) end |