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

Fix jruby server tests

Browse source 
We were accidentally connecting to a `nil` port, in my previous tests. MRI will interpret this the same as port 0. Jruby will not and throws an error

```
Error: test_very_large_return(TestPumaServer): TypeError: can't convert nil into String
org/jruby/ext/socket/RubyTCPServer.java:102:in `initialize'
org/jruby/RubyIO.java:851:in `new'
```

This tests makes sure we're using a port number instead of nil.
This commit is contained in:
schneems 2016-02-04 12:22:17 -06:00
parent f048f38416
commit 5f722aa99e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/puma/binder.rb
View file

@ -165,7 +165,7 @@ module Puma
@events.error "Please specify the SSL ca via 'ca='"
end
end
ctx.ca = params['ca'] if params['ca']
if params['verify_mode']

10
test/test_puma_server.rb
View file

@ -59,7 +59,7 @@ class TestPumaServer < Test::Unit::TestCase
[-1, {}, []]
end
@server.add_tcp_listener @host, @server.connected_port
@server.add_tcp_listener @host, @port
@server.run
sock = TCPSocket.new @host, @server.connected_port
@ -75,7 +75,7 @@ class TestPumaServer < Test::Unit::TestCase
[200, {}, [giant]]
end
@server.add_tcp_listener @host, @server.connected_port
@server.add_tcp_listener @host, @port
@server.run
sock = TCPSocket.new @host, @server.connected_port
@ -96,7 +96,7 @@ class TestPumaServer < Test::Unit::TestCase
[200, {}, [env['SERVER_PORT']]]
end
@server.add_tcp_listener @host, @server.connected_port
@server.add_tcp_listener @host, @port
@server.run
req = Net::HTTP::Get.new("/")
@ -115,7 +115,7 @@ class TestPumaServer < Test::Unit::TestCase
[200, {}, [env['SERVER_PORT']]]
end
@server.add_tcp_listener @host, @server.connected_port
@server.add_tcp_listener @host, @port
@server.run
req = Net::HTTP::Get.new("/")
@ -159,7 +159,7 @@ class TestPumaServer < Test::Unit::TestCase
def test_GET_with_no_body_has_sane_chunking
@server.app = proc { |env| [200, {}, []] }
@server.add_tcp_listener @host, @server.connected_port
@server.add_tcp_listener @host, @port
@server.run
sock = TCPSocket.new @host, @server.connected_port