Skip to content

Conversation

@grosser
Copy link
Contributor

@grosser grosser commented Jun 1, 2017

@grosser grosser force-pushed the grosser/cleanup branch 4 times, most recently from 223ab53 to 386a8b2 Compare June 1, 2017 23:57
@grosser grosser changed the title start tests without bundler and make sure no other version of puma is… simplify test shellout and make sure no other version of puma is available so we know our tests work Jun 2, 2017
@grosser
Copy link
Contributor Author

grosser commented Jun 2, 2017

updated ... realized I cannot remove bundler since then the gem would not be found (we already run the shellout with bundler since RUBYOPT is set) ... and switching to bundle exec does not work without the patch from #1309 ... so for now just some cleanup to make the other PRs cleaner

@grosser grosser force-pushed the grosser/cleanup branch from 386a8b2 to d02b942 Compare June 2, 2017 05:27
@nateberkopec
Copy link
Member

@grosser grosser force-pushed the grosser/cleanup branch 3 times, most recently from d5f311d to 942a253 Compare June 2, 2017 16:03
@grosser
Copy link
Contributor Author

grosser commented Jun 2, 2017

error seems to be:

  2) Error:
TestIntegration#test_restart_closes_keepalive_sockets:
#<Class:0x3cfe95b1>: execution expired
    org/jruby/RubyIO.java:2233:in `gets'
    /home/travis/build/puma/puma/test/test_integration.rb:93:in `wait_for_server_to_boot'
    /home/travis/build/puma/puma/test/test_integration.rb:82:in `restart_server'
    /home/travis/build/puma/puma/test/test_integration.rb:56:in `restart_server_and_listen'
    /home/travis/build/puma/puma/test/test_integration.rb:208:in `test_restart_closes_keepalive_sockets'

already restarted it twice ... reproduced it and turns out the -Ilib re-injection did not work on jruby ... so another bug fixed :D

@grosser grosser force-pushed the grosser/cleanup branch 4 times, most recently from 914398f to c423563 Compare June 2, 2017 16:25
@grosser
Copy link
Contributor Author

grosser commented Jun 2, 2017

added more time to the timeout since it kept failing and on master the test took 59s ... on this branch it took 64 ... so I hope just randomness but now jruby has a bit more time ...

time ruby test/test_integration.rb -n 'TestIntegration#test_restart_closes_keepalive_sockets'

@grosser grosser force-pushed the grosser/cleanup branch from c423563 to b27a517 Compare June 2, 2017 16:51
@grosser
Copy link
Contributor Author

grosser commented Jun 2, 2017

somehow TestThreadPool#test_trim_is_ignored_if_no_waiting_threads failed on ruby 2.1 now ... but should be unrealted ...

@grosser
Copy link
Contributor Author

grosser commented Jun 2, 2017

2.1 and jruby are green 🎉

@nateberkopec nateberkopec merged commit febef44 into puma:master Jun 2, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants