naruse	2012-07-19 01:48:54 +0900 (Thu, 19 Jul 2012)

  New Revision: 36453

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

  Log:
    use localhost for both local and remote. [Bug #6746]

  Modified files:
    trunk/test/net/http/test_http.rb

Index: test/net/http/test_http.rb
===================================================================
--- test/net/http/test_http.rb	(revision 36452)
+++ test/net/http/test_http.rb	(revision 36453)
@@ -611,7 +611,7 @@
 
     start {|http|
       assert_raises(EOFError, Errno::ECONNRESET, IOError) {
-        res = http.get('/')
+        http.get('/')
       }
     }
   end
@@ -619,7 +619,7 @@
 
 class TestNetHTTPLocalBind < Test::Unit::TestCase
   CONFIG = {
-    'host' => '127.0.0.1',
+    'host' => 'localhost',
     'port' => 10081,
     'proxy_host' => nil,
     'proxy_port' => nil,
@@ -632,7 +632,7 @@
     @server.mount_proc('/show_ip') { |req, res| res.body = req.remote_ip }
 
     http = Net::HTTP.new(config('host'), config('port'))
-    http.local_host = _select_local_ip_address(config('host'), config('port'))
+    http.local_host = Addrinfo.tcp(config('host'), config('port')).ip_address
     assert_not_nil(http.local_host)
     assert_nil(http.local_port)
 
@@ -645,7 +645,7 @@
     @server.mount_proc('/show_port') { |req, res| res.body = req.peeraddr[1].to_s }
 
     http = Net::HTTP.new(config('host'), config('port'))
-    http.local_host = _select_local_ip_address(config('host'), config('port'))
+    http.local_host = Addrinfo.tcp(config('host'), config('port')).ip_address
     http.local_port = [*10000..20000].shuffle.first.to_s
     assert_not_nil(http.local_host)
     assert_not_nil(http.local_port)
@@ -653,12 +653,4 @@
     res = http.get('/show_port')
     assert_equal(http.local_port, res.body)
   end
-
-  def _select_local_ip_address(saddr, sport)
-    Socket.ip_address_list.find { |addr|
-      next if Addrinfo.tcp(saddr, sport).afamily != addr.afamily
-      addr.ipv4? ? !addr.ipv4_loopback? && !addr.ipv4_multicast? \
-                 : !addr.ipv6_loopback? && !addr.ipv6_multicast?
-    }.ip_address
-  end
 end

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