From 515ecb6f5c3395614f03c5815c46956d3603a16a Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Apr 2008 15:36:36 +0000
Subject: * test/openssl/test_ssl.rb (start_server): add timeout to
 server.join.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/openssl/test_ssl.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'test')

diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb
index b1bbc656d..fe7327604 100644
--- a/test/openssl/test_ssl.rb
+++ b/test/openssl/test_ssl.rb
@@ -129,7 +129,14 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
       block.call(server, port.to_i)
     ensure
       tcps.close if (tcps)
-      server.join if (server)
+      if (server)
+        server.join(5)
+        if server.alive?
+          server.kill
+          server.join
+          flunk("TCPServer was closed and SSLServer is still alive") unless $!
+        end
+      end
     end
   end
 
-- 
cgit