nobu	2014-12-13 16:12:56 +0900 (Sat, 13 Dec 2014)

  New Revision: 48825

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48825

  Log:
    skip old OpenSSL
    
    * test/open-uri/test_ssl.rb, test/webrick/test_httpproxy.rb: also
      depends on test/openssl/utils.rb.

  Modified files:
    trunk/test/open-uri/test_ssl.rb
    trunk/test/webrick/test_httpproxy.rb
Index: test/webrick/test_httpproxy.rb
===================================================================
--- test/webrick/test_httpproxy.rb	(revision 48824)
+++ test/webrick/test_httpproxy.rb	(revision 48825)
@@ -123,7 +123,7 @@ class TestWEBrickHTTPProxy < Test::Unit: https://github.com/ruby/ruby/blob/trunk/test/webrick/test_httpproxy.rb#L123
       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: https://github.com/ruby/ruby/blob/trunk/test/webrick/test_httpproxy.rb#L172
         }
       }
     }
-  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: https://github.com/ruby/ruby/blob/trunk/test/webrick/test_httpproxy.rb#L240
         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
Index: test/open-uri/test_ssl.rb
===================================================================
--- test/open-uri/test_ssl.rb	(revision 48824)
+++ test/open-uri/test_ssl.rb	(revision 48825)
@@ -170,8 +170,9 @@ class TestOpenURISSL https://github.com/ruby/ruby/blob/trunk/test/open-uri/test_ssl.rb#L170
     }
   end
 
-end if defined?(OpenSSL)
+end if defined?(OpenSSL::TestUtils)
 
+if defined?(OpenSSL::TestUtils)
 # mkdir demoCA demoCA/private demoCA/newcerts
 # touch demoCA/index.txt
 # echo 00 > demoCA/serial
@@ -385,3 +386,5 @@ TIvZKDovHJ3UV163xaECQEVQR2ZW6SHZQA6vP/IF https://github.com/ruby/ruby/blob/trunk/test/open-uri/test_ssl.rb#L386
 P0ZCl31aopNsBcKLiy2v1X116XDwLSHjuc9NmsSX4nk=
 -----END RSA PRIVATE KEY-----
 End
+
+end

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/