Disable HEv2 tests temporarily (#12097)
* Disable HEv2 tests temporarily To suppress error log output in CI. They should have been DISABLE in PR #12070. --- Additionally, the following fixes have been made: - Remove unnecessary `assert_separately` from the related tests
This commit is contained in:
parent
31741719ae
commit
84470d72c5
Notes:
git
2024-11-15 09:12:54 +00:00
Merged-By: shioimm <shioi.mm@gmail.com>
@ -142,191 +142,170 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
||||
end
|
||||
|
||||
def test_initialize_v6_hostname_resolved_earlier
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 1000 } }
|
||||
)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 1000 } }
|
||||
)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v4_hostname_resolved_earlier
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
port = server.addr[1]
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
port = server.addr[1]
|
||||
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: 1000 } }
|
||||
)
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: 1000 } }
|
||||
)
|
||||
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v6_hostname_resolved_in_resolution_delay
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
|
||||
port = server.addr[1]
|
||||
delay_time = 25 # Socket::RESOLUTION_DELAY (private) is 50ms
|
||||
port = server.addr[1]
|
||||
delay_time = 25 # Socket::RESOLUTION_DELAY (private) is 50ms
|
||||
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: delay_time } }
|
||||
)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: delay_time } }
|
||||
)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v6_hostname_resolved_earlier_and_v6_server_is_not_listening
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
ipv4_address = "127.0.0.1"
|
||||
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
|
||||
port = ipv4_server.connect_address.ip_port
|
||||
ipv4_address = "127.0.0.1"
|
||||
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
|
||||
port = ipv4_server.connect_address.ip_port
|
||||
|
||||
ipv4_server_thread = Thread.new { ipv4_server.listen(1); ipv4_server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 10 } }
|
||||
)
|
||||
assert_equal(ipv4_address, socket.remote_address.ip_address)
|
||||
|
||||
accepted, _ = ipv4_server_thread.value
|
||||
accepted.close
|
||||
ipv4_server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
ipv4_server_thread = Thread.new { ipv4_server.listen(1); ipv4_server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 10 } }
|
||||
)
|
||||
assert_equal(ipv4_address, socket.remote_address.ip_address)
|
||||
accepted, _ = ipv4_server_thread.value
|
||||
accepted.close
|
||||
ipv4_server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v6_hostname_resolved_later_and_v6_server_is_not_listening
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, "127.0.0.1"))
|
||||
port = ipv4_server.connect_address.ip_port
|
||||
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, "127.0.0.1"))
|
||||
port = ipv4_server.connect_address.ip_port
|
||||
|
||||
ipv4_server_thread = Thread.new { ipv4_server.listen(1); ipv4_server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: 25 } }
|
||||
)
|
||||
ipv4_server_thread = Thread.new { ipv4_server.listen(1); ipv4_server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv6: 25 } }
|
||||
)
|
||||
|
||||
assert_equal(
|
||||
socket.remote_address.ipv4?,
|
||||
true
|
||||
)
|
||||
accepted, _ = ipv4_server_thread.value
|
||||
accepted.close
|
||||
ipv4_server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
assert_equal(
|
||||
socket.remote_address.ipv4?,
|
||||
true
|
||||
)
|
||||
accepted, _ = ipv4_server_thread.value
|
||||
accepted.close
|
||||
ipv4_server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v6_hostname_resolution_failed_and_v4_hostname_resolution_is_success
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
port = server.addr[1]
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
port = server.addr[1]
|
||||
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 10 }, error: { ipv6: Socket::EAI_FAIL } }
|
||||
)
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 10 }, error: { ipv6: Socket::EAI_FAIL } }
|
||||
)
|
||||
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_resolv_timeout_with_connection_failure
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
server = TCPServer.new("::1", 0)
|
||||
port = server.connect_address.ip_port
|
||||
server.close
|
||||
|
||||
begin;
|
||||
assert_raise(Errno::ETIMEDOUT) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
resolv_timeout: 0.01,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 1000 } }
|
||||
)
|
||||
end
|
||||
end;
|
||||
assert_raise(Errno::ETIMEDOUT) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
resolv_timeout: 0.01,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 1000 } }
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def test_initialize_with_hostname_resolution_failure_after_connection_failure
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
@ -335,87 +314,85 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
||||
port = server.connect_address.ip_port
|
||||
server.close
|
||||
|
||||
begin;
|
||||
assert_raise(Socket::ResolutionError) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv4: Socket::EAI_FAIL } }
|
||||
)
|
||||
end
|
||||
end;
|
||||
assert_raise(Socket::ResolutionError) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv4: Socket::EAI_FAIL } }
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def test_initialize_with_connection_failure_after_hostname_resolution_failure
|
||||
pend "to suppress the output of test failure logs in CI temporarily"
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
port = server.connect_address.ip_port
|
||||
server.close
|
||||
|
||||
begin;
|
||||
assert_raise(Errno::ECONNREFUSED) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv6: Socket::EAI_FAIL } }
|
||||
)
|
||||
end
|
||||
end;
|
||||
assert_raise(Errno::ECONNREFUSED) do
|
||||
TCPSocket.new(
|
||||
"localhost",
|
||||
port,
|
||||
fast_fallback: true,
|
||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv6: Socket::EAI_FAIL } }
|
||||
)
|
||||
end
|
||||
end
|
||||
|
||||
def test_initialize_v6_connected_socket_with_v6_address
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
begin
|
||||
server = TCPServer.new("::1", 0)
|
||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||
exit
|
||||
end
|
||||
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
|
||||
socket = TCPSocket.new("::1", port)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
socket = TCPSocket.new("::1", port)
|
||||
assert_true(socket.remote_address.ipv6?)
|
||||
ensure
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_v4_connected_socket_with_v4_address
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
opts = %w[-rsocket -W1]
|
||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
||||
|
||||
begin;
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
server_thread = Thread.new { server.accept }
|
||||
port = server.addr[1]
|
||||
|
||||
socket = TCPSocket.new("127.0.0.1", port)
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end;
|
||||
socket = TCPSocket.new("127.0.0.1", port)
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
ensure
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
end
|
||||
|
||||
def test_initialize_fast_fallback_is_false
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
|
||||
server = TCPServer.new("127.0.0.1", 0)
|
||||
_, port, = server.addr
|
||||
server_thread = Thread.new { server.accept }
|
||||
socket = TCPSocket.new("127.0.0.1", port, fast_fallback: false)
|
||||
|
||||
socket = TCPSocket.new("127.0.0.1", port, fast_fallback: false)
|
||||
assert_true(socket.remote_address.ipv4?)
|
||||
ensure
|
||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||
|
||||
server_thread.value.close
|
||||
server.close
|
||||
socket.close if socket && !socket.closed?
|
||||
|
Loading…
x
Reference in New Issue
Block a user