Catch the correct timeout exception during Server#boot
TimeoutError is actually Capybara::TimeoutError, which is unrelated to Ruby's Timeout
This commit is contained in:
parent
2b324d3200
commit
13bca79d45
|
@ -76,7 +76,7 @@ module Capybara
|
||||||
|
|
||||||
Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
|
Timeout.timeout(60) { @server_thread.join(0.1) until responsive? }
|
||||||
end
|
end
|
||||||
rescue TimeoutError
|
rescue Timeout::Error
|
||||||
raise "Rack application timed out during boot"
|
raise "Rack application timed out during boot"
|
||||||
else
|
else
|
||||||
self
|
self
|
||||||
|
|
Loading…
Reference in New Issue