[前][次][番号順一覧][スレッド一覧]

ruby-changes:41931

From: odaira <ko1@a...>
Date: Sat, 5 Mar 2016 09:54:22 +0900 (JST)
Subject: [ruby-changes:41931] odaira:r54005 (trunk): * test/socket/test_addrinfo.rb (test_ipv6_address_predicates):

odaira	2016-03-05 09:54:17 +0900 (Sat, 05 Mar 2016)

  New Revision: 54005

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54005

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/test/socket/test_addrinfo.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54004)
+++ ChangeLog	(revision 54005)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Mar  5 09:50:58 2016  Rei Odaira  <Rei.Odaira@g...>
+
+	* 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.
+
 Sat Mar  5 09:17:54 2016  Rei Odaira  <Rei.Odaira@g...>
 
 	* test/rinda/test_rinda.rb (test_make_socket_ipv4_multicast):
Index: test/socket/test_addrinfo.rb
===================================================================
--- test/socket/test_addrinfo.rb	(revision 54004)
+++ test/socket/test_addrinfo.rb	(revision 54005)
@@ -544,7 +544,14 @@ class TestSocketAddrinfo < Test::Unit::T https://github.com/ruby/ruby/blob/trunk/test/socket/test_addrinfo.rb#L544
 	    # MacOS X returns IPv4 address for ::ffff:1.2.3.4 and ::1.2.3.4.
             # Solaris returns IPv4 address for ::ffff:1.2.3.4.
 	    ai = ipv6(addr)
-	    assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
+            begin
+	      assert(ai.ipv4? || ai.send(meth), "ai=#{addr_exp}; ai.ipv4? || .#{meth}")
+            rescue Minitest::Assertion
+              if /aix/ =~ RUBY_PLATFORM
+                skip "Known bug in IN6_IS_ADDR_V4COMPAT and IN6_IS_ADDR_V4MAPPED on AIX"
+              end
+              raise $!
+            end
 	  else
 	    assert(ipv6(addr).send(meth), "#{addr_exp}.#{meth}")
             assert_equal(addr, ipv6(addr).ip_address)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]