From 35920f7a440139563e9e46686378bba062bd08c1 Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Sat, 15 Mar 2025 15:52:49 +0900 Subject: [PATCH] Refine `TestSocket_TCPSocket#test_initialize_failure` * Use `assert_raise_kind_of` instead of `rescue` and `flunk`. * Use `assert_include` for the pattern that may contain regexp meta characters. --- test/socket/test_tcp.rb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/test/socket/test_tcp.rb b/test/socket/test_tcp.rb index 3cc3e18841..be6d59b31e 100644 --- a/test/socket/test_tcp.rb +++ b/test/socket/test_tcp.rb @@ -49,16 +49,14 @@ class TestSocket_TCPSocket < Test::Unit::TestCase server_addr = '127.0.0.1' server_port = 80 - begin + e = assert_raise_kind_of(SystemCallError) do # Since client_addr is not an IP address of this host, # bind() in TCPSocket.new should fail as EADDRNOTAVAIL. t = TCPSocket.new(server_addr, server_port, client_addr, client_port) - flunk "expected SystemCallError" - rescue SystemCallError => e - assert_match "for \"#{client_addr}\" port #{client_port}", e.message + ensure + t&.close end - ensure - t.close if t && !t.closed? + assert_include e.message, "for \"#{client_addr}\" port #{client_port}" end def test_initialize_resolv_timeout