naruse	2012-04-09 19:49:46 +0900 (Mon, 09 Apr 2012)

  New Revision: 35270

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

  Log:
    Wait until the callback is called with timeout.

  Modified files:
    trunk/test/openssl/test_ssl_session.rb

Index: test/openssl/test_ssl_session.rb
===================================================================
--- test/openssl/test_ssl_session.rb	(revision 35269)
+++ test/openssl/test_ssl_session.rb	(revision 35270)
@@ -351,9 +351,12 @@
         ssl.connect
         last_client_session = ssl.session
         ssl.close
-        Thread.pass # try to ensure server calls callbacks
-        assert(called.delete(:new))
-        assert(called.delete(:remove))
+        timeout(5) do
+          Thread.pass until called.key?(:new)
+          assert(called.delete(:new))
+          Thread.pass until called.key?(:remove)
+          assert(called.delete(:remove))
+        end
       end
     end
     assert(called[:get1])

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