diff options
| author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 15:36:36 +0000 |
|---|---|---|
| committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-04-22 15:36:36 +0000 |
| commit | 67acbe3954a49278f7c92f4e62f9b6827839dfac (patch) | |
| tree | b111d55b507f07222d4dda10f8a9bef3abb25209 /test/openssl | |
| parent | 77f987376cb2489807c23e5192bae69b233acdea (diff) | |
* test/openssl/test_ssl.rb (start_server): add timeout to server.join.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16161 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
| -rw-r--r-- | test/openssl/test_ssl.rb | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index b1bbc656dd..fe7327604f 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 |