kotovalexarian-likes-github/puma--puma
1
0
Fork 0
mirror of https://github.com/puma/puma.git synced 2022-11-09 13:48:40 -05:00
Code Releases Activity

run tests with bundler since that is what our users run (#1317)

Browse source
This commit is contained in:
Michael Grosser 2017-06-09 05:20:03 -07:00 • committed by Nate Berkopec
parent 2cb2357d39
commit 0886aef3d0
5 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/helper.rb
View file

@ -36,9 +36,13 @@ def hit(uris)
end
module TimeoutEveryTestCase
# our own subclass so we never confused different timeouts
class TestTookTooLong < Timeout::Error
end
def run(*)
if ENV['CI']
::Timeout.timeout(Puma.jruby? ? 120 : 30) { super }
::Timeout.timeout(Puma.jruby? ? 120 : 30, TestTookTooLong) { super }
else
super # we want to be able to use debugger
end