mirror of
https://github.com/puma/puma.git
synced 2022-11-09 13:48:40 -05:00
Fix a bunch of test warnings
This commit is contained in:
parent
72ebf4458b
commit
58104628f3
4 changed files with 5 additions and 5 deletions
|
@ -133,7 +133,7 @@ module Puma
|
|||
o.on "-f", "--fork-worker=[REQUESTS]", OptionParser::DecimalInteger,
|
||||
"Fork new workers from existing worker. Cluster mode only",
|
||||
"Auto-refork after REQUESTS (default 1000)" do |*args|
|
||||
user_config.fork_worker *args.compact
|
||||
user_config.fork_worker(*args.compact)
|
||||
end
|
||||
|
||||
o.on "-I", "--include PATH", "Specify $LOAD_PATH directories" do |arg|
|
||||
|
|
|
@ -337,11 +337,11 @@ module Puma
|
|||
# Wait for threads to finish without force shutdown.
|
||||
threads.each(&:join)
|
||||
else
|
||||
join = ->(timeout) do
|
||||
join = ->(inner_timeout) do
|
||||
start = Process.clock_gettime(Process::CLOCK_MONOTONIC)
|
||||
threads.reject! do |t|
|
||||
elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start
|
||||
t.join timeout - elapsed
|
||||
t.join inner_timeout - elapsed
|
||||
end
|
||||
end
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ class TestIntegrationSingle < TestIntegration
|
|||
cli_server "-C test/config/with_rackup_from_dsl.rb test/rackup/hello.ru"
|
||||
connection = connect
|
||||
reply = read_body(connection)
|
||||
_, status = stop_server
|
||||
stop_server
|
||||
|
||||
assert_match("Hello World", reply)
|
||||
end
|
||||
|
|
|
@ -902,7 +902,7 @@ EOF
|
|||
|
||||
s2 << "\r\n"
|
||||
|
||||
assert_match /204/, s1.gets
|
||||
assert_match(/204/, s1.gets)
|
||||
|
||||
assert IO.select([s2], nil, nil, app_delay), 'timeout waiting for response'
|
||||
s2_result = begin
|
||||
|
|
Loading…
Reference in a new issue