diff options
author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-16 05:56:44 +0000 |
---|---|---|
committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-07-16 05:56:44 +0000 |
commit | 5fb266b5c0a75d542b462eba1883d4908b7cea58 (patch) | |
tree | c68b4426fd5b43f99dd057d7a146180581a9c912 /test/openssl | |
parent | cc01e4ee921887bae0a92f00baf38fc550681ecd (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/branches/ruby_1_8@6650 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/openssl')
-rw-r--r-- | test/openssl/ssl_server.rb | 6 | ||||
-rw-r--r-- | test/openssl/test_ssl.rb | 5 |
2 files changed, 2 insertions, 9 deletions
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 55f7920313..e13ccbfb14 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 |