Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions lib/http/timeout/null.rb
Original file line number Diff line number Diff line change
Expand Up @@ -185,12 +185,14 @@ def rescue_writable(timeout = write_timeout)
# @return [Object] the connected socket
# @api private
def open_socket(socket_class, host, port, connect_timeout: nil)
if connect_timeout
return socket_class.open(host, port) unless connect_timeout

if native_timeout?(socket_class)
open_with_timeout(socket_class, host, port, connect_timeout)
else
::Timeout.timeout(connect_timeout, ConnectTimeoutError) do
open_with_timeout(socket_class, host, port, connect_timeout)
end
else
socket_class.open(host, port)
end
rescue IO::TimeoutError
raise ConnectTimeoutError, "Connect timed out after #{connect_timeout} seconds"
Expand Down
2 changes: 1 addition & 1 deletion test/http/client_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ def test_feature_is_given_a_chance_to_handle_a_connection_timeout_error
sleep_url = "#{dummy.endpoint}/sleep"
feature_instance = feature_class.new

TCPSocket.stub(:open, ->(*) { sleep 0.1 }) do
TCPSocket.stub(:open, ->(*, **) { raise IO::TimeoutError }) do
assert_raises(HTTP::ConnectTimeoutError) do
client.use(test_feature: feature_instance)
.timeout(0.001)
Expand Down
4 changes: 2 additions & 2 deletions test/support/http_handling_shared/timeout_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@ def test_timeout_global_errors_if_connecting_takes_too_long
timeout_options: { global_timeout: 0.01 }
)

TCPSocket.stub(:open, ->(*) { sleep 0.025 }) do
TCPSocket.stub(:open, ->(*, **) { raise IO::TimeoutError }) do
err = assert_raises(HTTP::ConnectTimeoutError) { client.get(server.endpoint).body.to_s }
assert_match(/execution/, err.message)
assert_match(/Connect timed out|execution/, err.message)
end
end

Expand Down