summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authoremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-23 03:22:09 +0000
committeremboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-09-23 03:22:09 +0000
commitb3e0a54393eb5645c09f64ae2f60e3695beb245d (patch)
treef63480aea959e9eb51c5934d0e9d84b2b62edeae /test/openssl
parent010c8e5970a662db9a57886cdbcbdc7574c87664 (diff)
* backport r33311 from trunk.
* test/openssl/test_ssl_session.rb: ensure server calls callbacks in test_ctx_server_session_cb. Thanks to Eric Wong for the patch. [Bug #5336] [ruby-core:39619] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/test_ssl_session.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index 60079c6da1..172d0d4c9f 100644
--- a/test/openssl/test_ssl_session.rb
+++ b/test/openssl/test_ssl_session.rb
@@ -316,6 +316,7 @@ end
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))
end