1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

skip old OpenSSL

Browse Source 
* 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
This commit is contained in:
nobu 2014-12-13 07:12:56 +00:00
parent b392fd5c55
commit 21a40e94ac
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/open-uri/test_ssl.rb
View File

@ -170,8 +170,9 @@ class TestOpenURISSL
} }
end end
end if defined?(OpenSSL) end if defined?(OpenSSL::TestUtils)
if defined?(OpenSSL::TestUtils)
# mkdir demoCA demoCA/private demoCA/newcerts # mkdir demoCA demoCA/private demoCA/newcerts
# touch demoCA/index.txt # touch demoCA/index.txt
# echo 00 > demoCA/serial # echo 00 > demoCA/serial
@ -385,3 +386,5 @@ TIvZKDovHJ3UV163xaECQEVQR2ZW6SHZQA6vP/IFd6vnCECXiCpRs36GsLIDLm02
P0ZCl31aopNsBcKLiy2v1X116XDwLSHjuc9NmsSX4nk= P0ZCl31aopNsBcKLiy2v1X116XDwLSHjuc9NmsSX4nk=
-----END RSA PRIVATE KEY----- -----END RSA PRIVATE KEY-----
End End
end

6
test/webrick/test_httpproxy.rb
View File

@ -123,7 +123,7 @@ class TestWEBrickHTTPProxy < Test::Unit::TestCase
nil, nil, OpenSSL::Digest::SHA1.new nil, nil, OpenSSL::Digest::SHA1.new
) )
return cert return cert
end end if defined?(OpenSSL::TestUtils)
def test_connect def test_connect
# Testing CONNECT to proxy server # 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 def test_upstream_proxy
# Testing GET or POST through the upstream proxy server # 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, proxy_handler_called, up_log.call + log.call)
assert_equal(3, request_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 # Testing CONNECT to the upstream proxy server
# #
# client -------> proxy -------> proxy -------> https # client -------> proxy -------> proxy -------> https