summaryrefslogtreecommitdiff
path: root/test/net
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-15 11:12:20 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-15 11:12:20 +0000
commit0884b1d8b1e333a88a4ec4bff073e1e8c387203a (patch)
tree4282ac83f1eee47ba43006bde23685ce5af5e7ed /test/net
parent49f00d5d2dcc70fffa2501f639a8ef3ce1763d81 (diff)
catch EOFError in a thread.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/net')
-rw-r--r--test/net/http/test_https_proxy.rb12
1 files changed, 5 insertions, 7 deletions
diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb
index 7f4e96e..4f26342 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)