akr	2010-12-01 21:42:50 +0900 (Wed, 01 Dec 2010)

  New Revision: 29996

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

  Log:
    * test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
    
    * test/socket/test_socket.rb: ditto.

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29995)
+++ ChangeLog	(revision 29996)
@@ -1,3 +1,9 @@
+Wed Dec  1 21:41:57 2010  Tanaka Akira  <akr@f...>
+
+	* test/socket/test_addrinfo.rb: extract Errno::EADDRINUSE as a method.
+
+	* test/socket/test_socket.rb: ditto.
+
 Wed Dec  1 15:08:32 2010  NAKAMURA Usaku  <usa@r...>
 
 	* test/openssl/test_ssl.rb (test_not_started_session): non socket
Index: test/socket/test_addrinfo.rb
===================================================================
--- test/socket/test_addrinfo.rb	(revision 29995)
+++ test/socket/test_addrinfo.rb	(revision 29996)
@@ -330,6 +330,10 @@
     49152 + rand(65535-49152+1)
   end
 
+  def errors_addrinuse
+    [Errno::EADDRINUSE]
+  end
+
   def test_connect_from
     TCPServer.open("0.0.0.0", 0) {|serv|
       serv_ai = Addrinfo.new(serv.getsockname, :INET, :STREAM)
@@ -344,7 +348,7 @@
             s2.close
           end
         }
-      rescue Errno::EADDRINUSE
+      rescue *errors_addrinuse
         # not test failure
       end
     }
@@ -365,7 +369,7 @@
             s2.close
           end
         }
-      rescue Errno::EADDRINUSE
+      rescue *errors_addrinuse
         # not test failure
       end
     }
@@ -385,7 +389,7 @@
             s2.close
           end
         }
-      rescue Errno::EADDRINUSE
+      rescue *errors_addrinuse
         # not test failure
       end
     }
@@ -398,7 +402,7 @@
       client_ai.bind {|s|
         assert_equal(port, s.local_address.ip_port)
       }
-    rescue Errno::EADDRINUSE
+    rescue *errors_addrinuse
       # not test failure
     end
   end
@@ -422,7 +426,7 @@
           end
         }
       }
-    rescue Errno::EADDRINUSE
+    rescue *errors_addrinuse
       # not test failure
     end
   end
Index: test/socket/test_socket.rb
===================================================================
--- test/socket/test_socket.rb	(revision 29995)
+++ test/socket/test_socket.rb	(revision 29996)
@@ -105,11 +105,15 @@
     49152 + rand(65535-49152+1)
   end
 
+  def errors_addrinuse
+    [Errno::EADDRINUSE]
+  end
+
   def test_tcp_server_sockets
     port = random_port
     begin
       sockets = Socket.tcp_server_sockets(port)
-    rescue Errno::EADDRINUSE
+    rescue *errors_addrinuse
       return # not test failure
     end
     begin

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