From 55cdb8b01392848e426521f1589d51dc0fca9608 Mon Sep 17 00:00:00 2001 From: Hiroshi SHIBATA Date: Tue, 28 Dec 2021 20:29:43 +0900 Subject: Use omit instead of skip: test/socket/**/*.rb --- test/socket/test_addrinfo.rb | 2 +- test/socket/test_basicsocket.rb | 2 +- test/socket/test_nonblock.rb | 8 ++++---- test/socket/test_socket.rb | 6 +++--- test/socket/test_sockopt.rb | 2 +- test/socket/test_udp.rb | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) (limited to 'test/socket') diff --git a/test/socket/test_addrinfo.rb b/test/socket/test_addrinfo.rb index 5bd34cd5eb..bdf1f7649e 100644 --- a/test/socket/test_addrinfo.rb +++ b/test/socket/test_addrinfo.rb @@ -588,7 +588,7 @@ class TestSocketAddrinfo < Test::Unit::TestCase assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}") rescue Test::Unit::AssertionFailedError if /aix/ =~ RUBY_PLATFORM - skip "Known bug in IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED on AIX" + omit "Known bug in IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED on AIX" end raise $! end diff --git a/test/socket/test_basicsocket.rb b/test/socket/test_basicsocket.rb index 02e393d4e8..8c1b434a83 100644 --- a/test/socket/test_basicsocket.rb +++ b/test/socket/test_basicsocket.rb @@ -35,7 +35,7 @@ class TestSocket_BasicSocket < Test::Unit::TestCase rescue Test::Unit::AssertionFailedError s.close if /aix/ =~ RUBY_PLATFORM - skip "Known bug in getsockopt(2) on AIX" + omit "Known bug in getsockopt(2) on AIX" end raise $! end diff --git a/test/socket/test_nonblock.rb b/test/socket/test_nonblock.rb index 5d45593439..d9d1e186b2 100644 --- a/test/socket/test_nonblock.rb +++ b/test/socket/test_nonblock.rb @@ -279,7 +279,7 @@ class TestSocketNonblock < Test::Unit::TestCase s1.sendmsg_nonblock("a" * 100000) } rescue NotImplementedError, Errno::ENOSYS - skip "sendmsg not implemented on this platform: #{$!}" + omit "sendmsg not implemented on this platform: #{$!}" rescue Errno::EMSGSIZE # UDP has 64K limit (if no Jumbograms). No problem. rescue Errno::EWOULDBLOCK @@ -308,7 +308,7 @@ class TestSocketNonblock < Test::Unit::TestCase end end rescue NotImplementedError, Errno::ENOSYS, Errno::EPROTONOSUPPORT - skip "UNIXSocket.pair(:SEQPACKET) not implemented on this platform: #{$!}" + omit "UNIXSocket.pair(:SEQPACKET) not implemented on this platform: #{$!}" end def test_sendmsg_nonblock_no_exception @@ -329,7 +329,7 @@ class TestSocketNonblock < Test::Unit::TestCase end end rescue NotImplementedError, Errno::ENOSYS, Errno::EPROTONOSUPPORT - skip "UNIXSocket.pair(:SEQPACKET) not implemented on this platform: #{$!}" + omit "UNIXSocket.pair(:SEQPACKET) not implemented on this platform: #{$!}" end end @@ -338,7 +338,7 @@ class TestSocketNonblock < Test::Unit::TestCase begin s1.recvmsg_nonblock(4096) rescue NotImplementedError - skip "recvmsg not implemented on this platform." + omit "recvmsg not implemented on this platform." rescue Errno::EWOULDBLOCK assert_kind_of(IO::WaitReadable, $!) end diff --git a/test/socket/test_socket.rb b/test/socket/test_socket.rb index 7e596f0299..2c945aa9b9 100644 --- a/test/socket/test_socket.rb +++ b/test/socket/test_socket.rb @@ -343,7 +343,7 @@ class TestSocket < Test::Unit::TestCase begin ifaddrs = Socket.getifaddrs rescue NotImplementedError - skip "Socket.getifaddrs not implemented" + omit "Socket.getifaddrs not implemented" end ifconfig = nil @@ -437,10 +437,10 @@ class TestSocket < Test::Unit::TestCase } rescue NotImplementedError, Errno::ENOSYS skipped = true - skip "need sendmsg and recvmsg: #{$!}" + omit "need sendmsg and recvmsg: #{$!}" rescue RuntimeError skipped = true - skip "UDP server is no response: #{$!}" + omit "UDP server is no response: #{$!}" ensure if th if skipped diff --git a/test/socket/test_sockopt.rb b/test/socket/test_sockopt.rb index f166027d26..7e343e8c36 100644 --- a/test/socket/test_sockopt.rb +++ b/test/socket/test_sockopt.rb @@ -34,7 +34,7 @@ class TestSocketOption < Test::Unit::TestCase } rescue TypeError if /aix/ =~ RUBY_PLATFORM - skip "Known bug in getsockopt(2) on AIX" + omit "Known bug in getsockopt(2) on AIX" end raise $! end diff --git a/test/socket/test_udp.rb b/test/socket/test_udp.rb index f060b65f2c..4b2b7ab976 100644 --- a/test/socket/test_udp.rb +++ b/test/socket/test_udp.rb @@ -25,7 +25,7 @@ class TestSocket_UDPSocket < Test::Unit::TestCase assert_match(/AF_INET6\b/, sock.inspect) } rescue Errno::EAFNOSUPPORT - skip 'AF_INET6 not supported by kernel' + omit 'AF_INET6 not supported by kernel' end end end -- cgit v1.2.3