From 0884b1d8b1e333a88a4ec4bff073e1e8c387203a Mon Sep 17 00:00:00 2001 From: akr Date: Sat, 15 Dec 2007 11:12:20 +0000 Subject: [PATCH] catch EOFError in a thread. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/net/http/test_https_proxy.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb index 7f4e96e63c..4f26342339 100644 --- a/test/net/http/test_https_proxy.rb +++ b/test/net/http/test_https_proxy.rb @@ -14,7 +14,10 @@ class HTTPSProxyTest < Test::Unit::TestCase http = proxy.new("foo.example.org", 8000) http.use_ssl = true http.verify_mode = OpenSSL::SSL::VERIFY_NONE - http.start + begin + http.start + rescue EOFError + end } sock = serv.accept proxy_request = sock.gets("\r\n\r\n") @@ -28,12 +31,7 @@ class HTTPSProxyTest < Test::Unit::TestCase sock.close } ensure - if t - begin - t.join - rescue EOFError - end - end + t.join if t end end if defined?(OpenSSL)