Skip to content

Commit bf5d2c7

Browse files
author
odaira
committed
* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken on AIX, so skip related tests. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54005 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent 1874524 commit bf5d2c7

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

ChangeLog

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Sat Mar 5 09:50:58 2016 Rei Odaira <[email protected]>
2+
3+
* test/socket/test_addrinfo.rb (test_ipv6_address_predicates):
4+
IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED are broken
5+
on AIX, so skip related tests.
6+
17
Sat Mar 5 09:17:54 2016 Rei Odaira <[email protected]>
28

39
* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):

test/socket/test_addrinfo.rb

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,14 @@ def test_ipv6_address_predicates
544544
# MacOS X returns IPv4 address for ::ffff:1.2.3.4 and ::1.2.3.4.
545545
# Solaris returns IPv4 address for ::ffff:1.2.3.4.
546546
ai = ipv6(addr)
547-
assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
547+
begin
548+
assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
549+
rescue Minitest::Assertion
550+
if /aix/ =~ RUBY_PLATFORM
551+
skip "Known bug in IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED on AIX"
552+
end
553+
raise $!
554+
end
548555
else
549556
assert(ipv6(addr).send(meth), "#{addr_exp}.#{meth}")
550557
assert_equal(addr, ipv6(addr).ip_address)

0 commit comments

Comments
 (0)