akr	2011-10-22 20:35:58 +0900 (Sat, 22 Oct 2011)

  New Revision: 33508

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

  Log:
    * test/openssl/test_ssl.rb (test_multibyte_read_write): start server
      for each length to avoid race condition.

  Modified files:
    trunk/ChangeLog
    trunk/test/openssl/test_ssl.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 33507)
+++ ChangeLog	(revision 33508)
@@ -1,3 +1,8 @@
+Sat Oct 22 19:48:50 2011  Tanaka Akira  <akr@f...>
+
+	* test/openssl/test_ssl.rb (test_multibyte_read_write): start server
+	  for each length to avoid race condition.
+
 Sat Oct 22 18:49:24 2011  Tanaka Akira  <akr@f...>
 
 	* include/ruby/intern.h (rb_fd_set_cloexec): declared.
Index: test/openssl/test_ssl.rb
===================================================================
--- test/openssl/test_ssl.rb	(revision 33507)
+++ test/openssl/test_ssl.rb	(revision 33508)
@@ -400,20 +400,18 @@
     auml = [%w{ C3 A4 }.join('')].pack('H*')
     auml.force_encoding(Encoding::UTF_8)
 
-    str = nil
-    num_written = nil
-
-    server_proc = Proc.new {|ctx, ssl|
-      cmp = ssl.read
-      raw_size = cmp.size
-      cmp.force_encoding(Encoding::UTF_8)
-      assert_equal(str, cmp)
-      assert_equal(num_written, raw_size)
-      ssl.close
-    }
-
-    start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => server_proc){|server, port|
-      [10, 1000, 100000].each {|i|
+    [10, 1000, 100000].each {|i|
+      str = nil
+      num_written = nil
+      server_proc = Proc.new {|ctx, ssl|
+        cmp = ssl.read
+        raw_size = cmp.size
+        cmp.force_encoding(Encoding::UTF_8)
+        assert_equal(str, cmp)
+        assert_equal(num_written, raw_size)
+        ssl.close
+      }
+      start_server(PORT, OpenSSL::SSL::VERIFY_NONE, true, :server_proc => server_proc){|server, port|
         sock = TCPSocket.new("127.0.0.1", port)
         ssl = OpenSSL::SSL::SSLSocket.new(sock)
         ssl.sync_close = true

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