From 97094af3ca9cae3d8b388d24e624ba9116b1da09 Mon Sep 17 00:00:00 2001 From: gotoyuzo Date: Fri, 16 Jul 2004 05:56:44 +0000 Subject: * 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/trunk@6650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/openssl/ssl_server.rb | 6 ------ test/openssl/test_ssl.rb | 5 ++--- 2 files changed, 2 insertions(+), 9 deletions(-) (limited to 'test/openssl') diff --git a/test/openssl/ssl_server.rb b/test/openssl/ssl_server.rb index ce3c6132cd..699a181256 100644 --- a/test/openssl/ssl_server.rb +++ b/test/openssl/ssl_server.rb @@ -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 diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb index 3ca25cbfe1..637750af70 100644 --- a/test/openssl/test_ssl.rb +++ b/test/openssl/test_ssl.rb @@ -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 -- cgit v1.2.3