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 | 515ecb6f5c3395614f03c5815c46956d3603a16a (patch) | |
| tree | b111d55b507f07222d4dda10f8a9bef3abb25209 | |
| parent | 585e3d7772c7282559e528c1c8e7622d2809e632 (diff) | |
| download | ruby-515ecb6f5c3395614f03c5815c46956d3603a16a.tar.gz ruby-515ecb6f5c3395614f03c5815c46956d3603a16a.tar.xz ruby-515ecb6f5c3395614f03c5815c46956d3603a16a.zip | |
* 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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | test/openssl/test_ssl.rb | 9 |
2 files changed, 12 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Apr 23 00:36:03 2008 Yusuke Endoh <mame@tsg.ne.jp> + + * test/openssl/test_ssl.rb (start_server): add timeout to server.join. + Wed Apr 23 00:18:45 2008 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> * test/ruby/test_symbol.rb (TestSymbol#test_to_proc): Improve 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 |