Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix jruby server tests #877

Merged
merged 1 commit into from Feb 4, 2016
Merged

Fix jruby server tests #877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/puma/binder.rb
View file
Open in desktop
Expand Up @@ -165,7 +165,7 @@ def parse(binds, logger)
@events.error "Please specify the SSL ca via 'ca='"
end
end

ctx.ca = params['ca'] if params['ca']

if params['verify_mode']
Expand Down
10 changes: 5 additions & 5 deletions test/test_puma_server.rb
View file
Open in desktop
Expand Up @@ -59,7 +59,7 @@ def test_puma_socket
[-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
Expand All @@ -75,7 +75,7 @@ def test_very_large_return
[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
Expand All @@ -96,7 +96,7 @@ def test_respect_x_forwarded_proto
[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("/")
Expand All @@ -115,7 +115,7 @@ def test_default_server_port
[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("/")
Expand Down Expand Up @@ -159,7 +159,7 @@ def test_GET_with_empty_body_has_sane_chunking
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
Expand Down