From 1cac3e5640eb8309b386e7e015459252d968e8dc Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 15 Dec 2007 11:12:20 +0000
Subject: catch EOFError in a thread.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/net/http/test_https_proxy.rb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb
index 6332319f26..4f26342339 100644
--- a/test/net/http/test_https_proxy.rb
+++ b/test/net/http/test_https_proxy.rb
@@ -6,6 +6,7 @@ require 'test/unit'
 
 class HTTPSProxyTest < Test::Unit::TestCase
   def test_https_proxy_authentication
+    t = nil
     TCPServer.open("127.0.0.1", 0) {|serv|
       _, port, _, _ = serv.addr
       t = Thread.new {
@@ -13,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")
@@ -24,7 +28,10 @@ class HTTPSProxyTest < Test::Unit::TestCase
         "\r\n",
         proxy_request,
         "[ruby-dev:25673]")
+      sock.close
     }
+  ensure
+    t.join if t
   end
 end if defined?(OpenSSL)
  
-- 
cgit v1.2.3