summaryrefslogtreecommitdiff
path: root/test/openssl
diff options
context:
space:
mode:
authorgotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-16 05:56:44 +0000
committergotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-07-16 05:56:44 +0000
commit97094af3ca9cae3d8b388d24e624ba9116b1da09 (patch)
treeaa541e1b5efc9ef51832cc70ddec22a335cc18d7 /test/openssl
parent449ca256cc6ddc7a697376e938bd86c3bffa4196 (diff)
* 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
Diffstat (limited to 'test/openssl')
-rw-r--r--test/openssl/ssl_server.rb6
-rw-r--r--test/openssl/test_ssl.rb5
2 files changed, 2 insertions, 9 deletions
diff --git a/test/openssl/ssl_server.rb b/test/openssl/ssl_server.rb
index ce3c613..699a181 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 3ca25cb..637750a 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