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

make tests fast by using readpartial and not blocking read (#1322)

Browse source
This commit is contained in:
Michael Grosser 2017-06-03 21:23:55 -07:00 • committed by Nate Berkopec
parent ddf57c822d
commit 290c22c9ad
2 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/helper.rb
View file

@ -37,7 +37,7 @@ end
module TimeoutEveryTestCase module TimeoutEveryTestCase
def run(*) def run(*)
if ENV['CI'] if ENV['CI']
::Timeout.timeout(Puma.jruby? ? 120 : 60) { super } ::Timeout.timeout(Puma.jruby? ? 120 : 30) { super }
else else
super # we want to be able to use debugger super # we want to be able to use debugger
end end

27
test/test_integration.rb
View file

@ -23,7 +23,7 @@ class TestIntegration < Minitest::Test
def teardown def teardown
File.unlink @state_path rescue nil File.unlink @state_path rescue nil
File.unlink @bind_path rescue nil File.unlink @bind_path rescue nil
File.unlink @control_path rescue nil File.unlink @control_path rescue nil
@wait.close @wait.close
@ -52,9 +52,9 @@ class TestIntegration < Minitest::Test
def restart_server_and_listen(argv) def restart_server_and_listen(argv)
server(argv) server(argv)
s = connect s = connect
initial_reply = s.read initial_reply = read_body(s)
restart_server(s) restart_server(s)
[initial_reply, connect.read] [initial_reply, read_body(connect)]
end end
def signal(which) def signal(which)
@ -69,16 +69,8 @@ class TestIntegration < Minitest::Test
def restart_server(connection) def restart_server(connection)
signal :USR2 signal :USR2
sleep 1
connection.write "GET / HTTP/1.1\r\n\r\n" # trigger it to start by sending a new request connection.write "GET / HTTP/1.1\r\n\r\n" # trigger it to start by sending a new request
assert_raises Errno::ECONNRESET do
Timeout.timeout(2) do
raise Errno::ECONNRESET unless connection.read(2)
end
end
wait_for_server_to_boot wait_for_server_to_boot
end end
@ -93,6 +85,17 @@ class TestIntegration < Minitest::Test
true while @server.gets !~ /Ctrl-C/ # wait for server to say it booted true while @server.gets !~ /Ctrl-C/ # wait for server to say it booted
end end
def read_body(connection)
Timeout.timeout(10) do
loop do
response = connection.readpartial(1024)
body = response.split("\r\n\r\n", 2).last
return body if body && !body.empty?
sleep 0.01
end
end
end
def test_stop_via_pumactl def test_stop_via_pumactl
skip if Puma.jruby? || Puma.windows? skip if Puma.jruby? || Puma.windows?
@ -115,7 +118,7 @@ class TestIntegration < Minitest::Test
s = UNIXSocket.new @bind_path s = UNIXSocket.new @bind_path
s << "GET / HTTP/1.0\r\n\r\n" s << "GET / HTTP/1.0\r\n\r\n"
assert_equal "Hello World", s.read.split("\r\n").last assert_equal "Hello World", read_body(s)
sout = StringIO.new sout = StringIO.new