diff options
| author | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-02 15:55:07 +0000 |
|---|---|---|
| committer | kazu <kazu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-02-02 15:55:07 +0000 |
| commit | ca0bb51887a5682f1211c6fe627df778783ba0fd (patch) | |
| tree | 87bde53bcd4c11988c95742b606d8bcaaed64eb2 | |
| parent | ca77bce66d8b32816fd9cf4c7ee228bb5e3dfa7f (diff) | |
* test/net/http/test_https_proxy.rb
(HTTPSProxyTest#test_https_proxy_authentication):
add workaround to avoid to hang up without openssl.
see #5786
* test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address):
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34421 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | test/net/http/test_https_proxy.rb | 6 | ||||
| -rw-r--r-- | test/resolv/test_dns.rb | 6 |
3 files changed, 22 insertions, 0 deletions
@@ -1,3 +1,13 @@ +Thu Feb 2 22:28:13 2012 Kazuhiro NISHIYAMA <zn@mbf.nifty.com> + + * test/net/http/test_https_proxy.rb + (HTTPSProxyTest#test_https_proxy_authentication): + add workaround to avoid to hang up without openssl. + see #5786 + + * test/resolv/test_dns.rb (TestResolvDNS#test_query_ipv4_address): + ditto. + Thu Feb 2 21:48:18 2012 Kouhei Sutou <kou@cozmixng.org> * lib/rexml/parsers/baseparser.rb: use meaningful names. diff --git a/test/net/http/test_https_proxy.rb b/test/net/http/test_https_proxy.rb index 5618830587..57cabf05e0 100644 --- a/test/net/http/test_https_proxy.rb +++ b/test/net/http/test_https_proxy.rb @@ -6,6 +6,12 @@ require 'test/unit' class HTTPSProxyTest < Test::Unit::TestCase def test_https_proxy_authentication + begin + OpenSSL + rescue LoadError + skip 'autoload problem. see [ruby-dev:45021][Bug #5786]' + end + t = nil TCPServer.open("127.0.0.1", 0) {|serv| _, port, _, _ = serv.addr diff --git a/test/resolv/test_dns.rb b/test/resolv/test_dns.rb index 3827361e47..0d9565ef68 100644 --- a/test/resolv/test_dns.rb +++ b/test/resolv/test_dns.rb @@ -23,6 +23,12 @@ class TestResolvDNS < Test::Unit::TestCase end def test_query_ipv4_address + begin + OpenSSL + rescue LoadError + skip 'autoload problem. see [ruby-dev:45021][Bug #5786]' + end if defined?(OpenSSL) + with_udp('127.0.0.1', 0) {|u| _, server_port, _, server_address = u.addr begin |