summaryrefslogtreecommitdiff
path: root/test/webrick
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-13 07:12:56 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-12-13 07:12:56 +0000
commit21a40e94ac3404542c2bd83c388253ccf0fc96b0 (patch)
tree45df34fd526459368f8cc84f80e6c8fb969d0428 /test/webrick
parentb392fd5c55c4fc435f52203a18be6bc652af8fc7 (diff)
skip old OpenSSL
* test/open-uri/test_ssl.rb, test/webrick/test_httpproxy.rb: also depends on test/openssl/utils.rb. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48825 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick')
-rw-r--r--test/webrick/test_httpproxy.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/webrick/test_httpproxy.rb b/test/webrick/test_httpproxy.rb
index 304762c..501bb4c 100644
--- a/test/webrick/test_httpproxy.rb
+++ b/test/webrick/test_httpproxy.rb
@@ -123,7 +123,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
nil, nil, OpenSSL::Digest::SHA1.new
)
return cert
- end
+ end if defined?(OpenSSL::TestUtils)
def test_connect
# Testing CONNECT to proxy server
@@ -172,7 +172,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
}
}
}
- end if defined?(OpenSSL)
+ end if defined?(OpenSSL::TestUtils)
def test_upstream_proxy
# Testing GET or POST through the upstream proxy server
@@ -240,7 +240,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
assert_equal(3, proxy_handler_called, up_log.call + log.call)
assert_equal(3, request_handler_called, up_log.call + log.call)
- if defined?(OpenSSL)
+ if defined?(OpenSSL::TestUtils)
# Testing CONNECT to the upstream proxy server
#
# client -------> proxy -------> proxy -------> https