diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-09 10:49:46 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-09 10:49:46 +0000 |
commit | 8c8796333afcfc6a889cb7af614b4bf6b5d16057 (patch) | |
tree | 5ffa24a2ff0faa39d610d49e985c6ea799af9237 /test | |
parent | 41c199130a526efe27c39ea8e9d3f0134a8dfa5d (diff) | |
download | ruby-8c8796333afcfc6a889cb7af614b4bf6b5d16057.tar.gz |
Wait until the callback is called with timeout.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35270 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test')
-rw-r--r-- | test/openssl/test_ssl_session.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb index c3bfdac7b9..d04ebe2717 100644 --- a/test/openssl/test_ssl_session.rb +++ b/test/openssl/test_ssl_session.rb @@ -351,9 +351,12 @@ __EOS__ 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]) |