ko1	2017-05-16 13:23:10 +0900 (Tue, 16 May 2017)

  New Revision: 58739

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

  Log:
    skip openssl related tests.

  Modified files:
    trunk/test/net/ftp/test_ftp.rb
    trunk/test/net/smtp/test_smtp.rb
Index: test/net/smtp/test_smtp.rb
===================================================================
--- test/net/smtp/test_smtp.rb	(revision 58738)
+++ test/net/smtp/test_smtp.rb	(revision 58739)
@@ -135,6 +135,8 @@ module Net https://github.com/ruby/ruby/blob/trunk/test/net/smtp/test_smtp.rb#L135
         sock.close if sock
         servers.each(&:close)
       end
+    rescue LoadError
+      # skip (require openssl)
     end
 
     def test_tls_connect_timeout
@@ -151,6 +153,8 @@ module Net https://github.com/ruby/ruby/blob/trunk/test/net/smtp/test_smtp.rb#L153
           smtp.start do
           end
         end
+      rescue LoadError
+        # skip (require openssl)
       ensure
         sock.close if sock
         servers.each(&:close)
Index: test/net/ftp/test_ftp.rb
===================================================================
--- test/net/ftp/test_ftp.rb	(revision 58738)
+++ test/net/ftp/test_ftp.rb	(revision 58739)
@@ -2080,6 +2080,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L2080
   end
 
   def test_abort_tls
+    return unless defined?(OpenSSL)
+
     commands = []
     server = create_ftp_server { |sock|
       sock.print("220 (test_ftp).\r\n")
@@ -2124,6 +2126,8 @@ EOF https://github.com/ruby/ruby/blob/trunk/test/net/ftp/test_ftp.rb#L2126
         ftp.abort
         assert_equal("ABOR\r\n", commands.shift)
         assert_equal(nil, commands.shift)
+      rescue RuntimeError, LoadError
+        # skip (require openssl)
       ensure
         ftp.close if ftp
       end

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