mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* test/openssl/ssl_server.rb, test/openssl/test_ssl.rb: workaround to
terminate child process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
cc01e4ee92
commit
5fb266b5c0
2 changed files with 2 additions and 9 deletions
|
@ -50,12 +50,6 @@ tcps = TCPServer.new("0.0.0.0", port)
|
|||
ssls = OpenSSL::SSL::SSLServer.new(tcps, ctx)
|
||||
ssls.start_immediately = start_immediately
|
||||
|
||||
Thread.start{
|
||||
while true
|
||||
$stdin.gets || exit
|
||||
end
|
||||
}
|
||||
|
||||
$stdout.sync = true
|
||||
$stdout.puts Process.pid
|
||||
|
||||
|
|
|
@ -70,9 +70,8 @@ class OpenSSL::TestSSL < Test::Unit::TestCase
|
|||
block.call(server)
|
||||
ensure
|
||||
if server
|
||||
server.close_write
|
||||
Process.kill(:TERM, pid) rescue nil
|
||||
Process.waitpid(pid)
|
||||
Process.kill(:KILL, pid)
|
||||
server.close
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue