akr	2009-02-02 19:59:17 +0900 (Mon, 02 Feb 2009)

  New Revision: 21968

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21968

  Log:
    * test/socket/test_addrinfo.rb: use AddrInfo.getaddrinfo to generate
      IPv6 address.  AddrInfo.ip generates IPv4 address for IPv4 mapped
      IPv6 address if --with-lookup-order-hack=INET.
      [ruby-dev:37868]

  Modified files:
    trunk/ChangeLog
    trunk/test/socket/test_addrinfo.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21967)
+++ ChangeLog	(revision 21968)
@@ -1,3 +1,10 @@
+Mon Feb  2 19:55:51 2009  Tanaka Akira  <akr@f...>
+
+	* test/socket/test_addrinfo.rb: use AddrInfo.getaddrinfo to generate
+	  IPv6 address.  AddrInfo.ip generates IPv4 address for IPv4 mapped
+	  IPv6 address if --with-lookup-order-hack=INET.
+	  [ruby-dev:37868]
+
 Mon Feb  2 19:17:16 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* doc/NEWS-1.9.1: typo fixed: collect_all -> collect.
Index: test/socket/test_addrinfo.rb
===================================================================
--- test/socket/test_addrinfo.rb	(revision 21967)
+++ test/socket/test_addrinfo.rb	(revision 21968)
@@ -345,6 +345,10 @@
       assert_equal(ai1.canonname, ai2.canonname)
     end
 
+    def ipv6(str)
+      AddrInfo.getaddrinfo(str, nil, :INET6, :DGRAM).fetch(0)
+    end
+
     def test_ipv6_address_predicates
       list = [
         [:ipv6_unspecified?, "::"],
@@ -364,24 +368,26 @@
       ]
       list.each {|meth, *addrs|
         addrs.each {|addr|
-          assert(AddrInfo.ip(addr).send(meth), "AddrInfo.ip(#{addr.inspect}).#{meth}")
+          addr_exp = "AddrInfo.getaddrinfo(#{addr.inspect}, nil, :INET6, :DGRAM).fetch(0)"
+          assert(ipv6(addr).send(meth), "#{addr_exp}.#{meth}")
           list.each {|meth2,|
             next if meth == meth2
-            assert(!AddrInfo.ip(addr).send(meth2), "!AddrInfo.ip(#{addr.inspect}).#{meth2}")
+            assert(!ipv6(addr).send(meth2), "!#{addr_exp}.#{meth2}")
           }
         }
       }
       mlist.each {|meth, *addrs|
         addrs.each {|addr|
-          assert(AddrInfo.ip(addr).send(meth), "AddrInfo.ip(#{addr.inspect}).#{meth}")
-          assert(AddrInfo.ip(addr).ipv6_multicast?, "AddrInfo.ip(#{addr.inspect}).ipv6_multicast?")
+          addr_exp = "AddrInfo.getaddrinfo(#{addr.inspect}, nil, :INET6, :DGRAM).fetch(0)"
+          assert(ipv6(addr).send(meth), "#{addr_exp}.#{meth}")
+          assert(ipv6(addr).ipv6_multicast?, "#{addr_exp}.ipv6_multicast?")
           mlist.each {|meth2,|
             next if meth == meth2
-            assert(!AddrInfo.ip(addr).send(meth2), "!AddrInfo.ip(#{addr.inspect}).#{meth2}")
+            assert(!ipv6(addr).send(meth2), "!#{addr_exp}.#{meth2}")
           }
           list.each {|meth2,|
             next if :ipv6_multicast? == meth2
-            assert(!AddrInfo.ip(addr).send(meth2), "!AddrInfo.ip(#{addr.inspect}).#{meth2}")
+            assert(!ipv6(addr).send(meth2), "!#{addr_exp}.#{meth2}")
           }
         }
       }

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