From e3af0655e21a1f6e1fcf3d50c6ac8a5486d8b57b Mon Sep 17 00:00:00 2001
From: emboss <emboss@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Sep 2011 03:14:24 +0000
Subject: [PATCH] * 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/trunk@33311 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                        | 6 ++++++
 test/openssl/test_ssl_session.rb | 1 +
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 65ecd6fba8..15ab7b2e3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Sep 23 11:59:08 2011  Martin Bosslet  <Martin.Bosslet@googlemail.com>
+
+	* 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]
+
 Thu Sep 22 02:53:19 2011  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* vm_insnhelper.c (vm_call_cfunc): suppress a warning.  note that
diff --git a/test/openssl/test_ssl_session.rb b/test/openssl/test_ssl_session.rb
index b975c48d11..28d40ddcf2 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