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,11 +142,9 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_hostname_resolved_earlier
|
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/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
opts = %w[-rsocket -W1]
|
|
||||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
|
||||||
|
|
||||||
begin;
|
|
||||||
begin
|
begin
|
||||||
server = TCPServer.new("::1", 0)
|
server = TCPServer.new("::1", 0)
|
||||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||||
@ -166,15 +164,12 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v4_hostname_resolved_earlier
|
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/
|
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 = TCPServer.new("127.0.0.1", 0)
|
||||||
port = server.addr[1]
|
port = server.addr[1]
|
||||||
|
|
||||||
@ -190,15 +185,12 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_hostname_resolved_in_resolution_delay
|
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/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
opts = %w[-rsocket -W1]
|
|
||||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
|
||||||
|
|
||||||
begin;
|
|
||||||
begin
|
begin
|
||||||
server = TCPServer.new("::1", 0)
|
server = TCPServer.new("::1", 0)
|
||||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||||
@ -219,15 +211,12 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_hostname_resolved_earlier_and_v6_server_is_not_listening
|
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/
|
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_address = "127.0.0.1"
|
||||||
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
ipv4_server = Socket.new(Socket::AF_INET, :STREAM)
|
||||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
|
ipv4_server.bind(Socket.pack_sockaddr_in(0, ipv4_address))
|
||||||
@ -241,20 +230,16 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
test_mode_settings: { delay: { ipv4: 10 } }
|
test_mode_settings: { delay: { ipv4: 10 } }
|
||||||
)
|
)
|
||||||
assert_equal(ipv4_address, socket.remote_address.ip_address)
|
assert_equal(ipv4_address, socket.remote_address.ip_address)
|
||||||
|
|
||||||
accepted, _ = ipv4_server_thread.value
|
accepted, _ = ipv4_server_thread.value
|
||||||
accepted.close
|
accepted.close
|
||||||
ipv4_server.close
|
ipv4_server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_hostname_resolved_later_and_v6_server_is_not_listening
|
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/
|
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 = Socket.new(Socket::AF_INET, :STREAM)
|
||||||
ipv4_server.bind(Socket.pack_sockaddr_in(0, "127.0.0.1"))
|
ipv4_server.bind(Socket.pack_sockaddr_in(0, "127.0.0.1"))
|
||||||
port = ipv4_server.connect_address.ip_port
|
port = ipv4_server.connect_address.ip_port
|
||||||
@ -275,15 +260,12 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
accepted.close
|
accepted.close
|
||||||
ipv4_server.close
|
ipv4_server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_hostname_resolution_failed_and_v4_hostname_resolution_is_success
|
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/
|
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 = TCPServer.new("127.0.0.1", 0)
|
||||||
port = server.addr[1]
|
port = server.addr[1]
|
||||||
|
|
||||||
@ -299,18 +281,16 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_resolv_timeout_with_connection_failure
|
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/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
opts = %w[-rsocket -W1]
|
|
||||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
|
||||||
server = TCPServer.new("::1", 0)
|
server = TCPServer.new("::1", 0)
|
||||||
port = server.connect_address.ip_port
|
port = server.connect_address.ip_port
|
||||||
server.close
|
server.close
|
||||||
|
|
||||||
begin;
|
|
||||||
assert_raise(Errno::ETIMEDOUT) do
|
assert_raise(Errno::ETIMEDOUT) do
|
||||||
TCPSocket.new(
|
TCPSocket.new(
|
||||||
"localhost",
|
"localhost",
|
||||||
@ -320,13 +300,12 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
test_mode_settings: { delay: { ipv4: 1000 } }
|
test_mode_settings: { delay: { ipv4: 1000 } }
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_with_hostname_resolution_failure_after_connection_failure
|
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/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
opts = %w[-rsocket -W1]
|
|
||||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
|
||||||
begin
|
begin
|
||||||
server = TCPServer.new("::1", 0)
|
server = TCPServer.new("::1", 0)
|
||||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||||
@ -335,7 +314,6 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
port = server.connect_address.ip_port
|
port = server.connect_address.ip_port
|
||||||
server.close
|
server.close
|
||||||
|
|
||||||
begin;
|
|
||||||
assert_raise(Socket::ResolutionError) do
|
assert_raise(Socket::ResolutionError) do
|
||||||
TCPSocket.new(
|
TCPSocket.new(
|
||||||
"localhost",
|
"localhost",
|
||||||
@ -344,18 +322,16 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv4: Socket::EAI_FAIL } }
|
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv4: Socket::EAI_FAIL } }
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_with_connection_failure_after_hostname_resolution_failure
|
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/
|
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)
|
server = TCPServer.new("127.0.0.1", 0)
|
||||||
port = server.connect_address.ip_port
|
port = server.connect_address.ip_port
|
||||||
server.close
|
server.close
|
||||||
|
|
||||||
begin;
|
|
||||||
assert_raise(Errno::ECONNREFUSED) do
|
assert_raise(Errno::ECONNREFUSED) do
|
||||||
TCPSocket.new(
|
TCPSocket.new(
|
||||||
"localhost",
|
"localhost",
|
||||||
@ -364,15 +340,11 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv6: Socket::EAI_FAIL } }
|
test_mode_settings: { delay: { ipv4: 100 }, error: { ipv6: Socket::EAI_FAIL } }
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v6_connected_socket_with_v6_address
|
def test_initialize_v6_connected_socket_with_v6_address
|
||||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
opts = %w[-rsocket -W1]
|
|
||||||
assert_separately opts, "#{<<-"begin;"}\n#{<<-'end;'}"
|
|
||||||
|
|
||||||
begin;
|
|
||||||
begin
|
begin
|
||||||
server = TCPServer.new("::1", 0)
|
server = TCPServer.new("::1", 0)
|
||||||
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
rescue Errno::EADDRNOTAVAIL # IPv6 is not supported
|
||||||
@ -384,38 +356,43 @@ class TestSocket_TCPSocket < Test::Unit::TestCase
|
|||||||
|
|
||||||
socket = TCPSocket.new("::1", port)
|
socket = TCPSocket.new("::1", port)
|
||||||
assert_true(socket.remote_address.ipv6?)
|
assert_true(socket.remote_address.ipv6?)
|
||||||
|
ensure
|
||||||
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
|
|
||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_v4_connected_socket_with_v4_address
|
def test_initialize_v4_connected_socket_with_v4_address
|
||||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
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 = TCPServer.new("127.0.0.1", 0)
|
||||||
server_thread = Thread.new { server.accept }
|
server_thread = Thread.new { server.accept }
|
||||||
port = server.addr[1]
|
port = server.addr[1]
|
||||||
|
|
||||||
socket = TCPSocket.new("127.0.0.1", port)
|
socket = TCPSocket.new("127.0.0.1", port)
|
||||||
assert_true(socket.remote_address.ipv4?)
|
assert_true(socket.remote_address.ipv4?)
|
||||||
|
ensure
|
||||||
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
|
|
||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
end;
|
|
||||||
end
|
end
|
||||||
|
|
||||||
def test_initialize_fast_fallback_is_false
|
def test_initialize_fast_fallback_is_false
|
||||||
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
|
|
||||||
server = TCPServer.new("127.0.0.1", 0)
|
server = TCPServer.new("127.0.0.1", 0)
|
||||||
_, port, = server.addr
|
_, port, = server.addr
|
||||||
server_thread = Thread.new { server.accept }
|
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?)
|
assert_true(socket.remote_address.ipv4?)
|
||||||
|
ensure
|
||||||
|
return if RUBY_PLATFORM =~ /mswin|mingw|cygwin/
|
||||||
|
|
||||||
server_thread.value.close
|
server_thread.value.close
|
||||||
server.close
|
server.close
|
||||||
socket.close if socket && !socket.closed?
|
socket.close if socket && !socket.closed?
|
||||||
|
Loading…
x
Reference in New Issue
Block a user