From 0d58b7a4e6b8dde4418576856d38b1e882a92616 Mon Sep 17 00:00:00 2001
From: shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 15 Sep 2010 04:37:45 +0000
Subject: [PATCH] 	* test/net/imap/test_imap.rb: "localhost" not
 guaranteed to 	  resolve to "127.0.0.1".  On my machine it is "::1" instead. 
   The problem is, you have to connect to the imaps server via 	  the
 canonical name written in a server certificate, and that 	  of the
 server.cert is "localhost".  So you have to listen to 	  the address of what
 "localhost" resolves to.  I think this 	  situation cannot be resolved
 in a handy manner because the 	  test "test_imaps_post_connection_check" is
 actually 	  expecting to connect to a server via an address other than 
   the CN.  On my machine several assertions won't pass because 	  the
 test cannot connect to the server.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29257 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/net/imap/test_imap.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index cd9b2824a4..06ecca0f00 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -73,7 +73,7 @@ class IMAPTest < Test::Unit::TestCase
     if defined?(OpenSSL)
       assert_nothing_raised do
         imaps_test do |port|
-          Net::IMAP.new("localhost",
+          Net::IMAP.new(SERVER_ADDR,
                         :port => port,
                         :ssl => { :verify_mode => OpenSSL::SSL::VERIFY_NONE })
         end
@@ -129,7 +129,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         assert_raise(EOFError) do
           imap.logout
         end
@@ -167,7 +167,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         responses = []
         imap.idle do |res|
           responses.push(res)
@@ -219,7 +219,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         begin
           th = Thread.current
           m = Monitor.new
@@ -275,7 +275,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         assert_raise(Net::IMAP::Error) do
           imap.idle_done
         end
@@ -305,7 +305,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         assert_raise(Net::IMAP::ByeResponseError) do
           imap.login("user", "password")
         end
@@ -334,7 +334,7 @@ class IMAPTest < Test::Unit::TestCase
     end
     begin
       begin
-        imap = Net::IMAP.new("localhost", :port => port)
+        imap = Net::IMAP.new(SERVER_ADDR, :port => port)
         imap.instance_eval do
           def @sock.shutdown(*args)
             super