mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
77f987376c
commit
67acbe3954
2 changed files with 12 additions and 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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue