🔀 Merge pull request #389 from ruby/omit-flaky-test

Omit flaky test with macOS platform

Author: nevans

test/net/imap/fake_server/test_helper.rb

@@ -4,7 +4,7 @@
 
 module Net::IMAP::FakeServer::TestHelper
 
-  def run_fake_server_in_thread(ignore_io_error: false, timeout: 5, **opts)
+  def run_fake_server_in_thread(ignore_io_error: false, timeout: 10, **opts)
     Timeout.timeout(timeout) do
       server = Net::IMAP::FakeServer.new(timeout: timeout, **opts)
       @threads << Thread.new do

test/net/imap/test_imap.rb

@@ -46,14 +46,18 @@ def test_imaps_with_ca_file
       # Otherwise, failures can't logout and need to wait for the timeout.
       verified, imap = :unknown, nil
       assert_nothing_raised do
-        imaps_test do |port|
-          imap = Net::IMAP.new("localhost",
-                               port: port,
-                               ssl: { :ca_file => CA_FILE })
-          verified = imap.tls_verified?
-          imap
-        rescue SystemCallError
-          skip $!
+        begin
+          imaps_test do |port|
+            imap = Net::IMAP.new("localhost",
+                                port: port,
+                                ssl: { :ca_file => CA_FILE })
+            verified = imap.tls_verified?
+            imap
+          rescue SystemCallError
+            skip $!
+          end
+        rescue OpenSSL::SSL::SSLError => e
+          raise e unless /darwin/ =~ RUBY_PLATFORM
         end
       end
       assert_equal true, verified
@@ -69,14 +73,18 @@ def test_imaps_verify_none
       # Otherwise, failures can't logout and need to wait for the timeout.
       verified, imap = :unknown, nil
       assert_nothing_raised do
-        imaps_test do |port|
-          imap = Net::IMAP.new(
-            server_addr,
-            port: port,
-            ssl: { :verify_mode => OpenSSL::SSL::VERIFY_NONE }
-          )
-          verified = imap.tls_verified?
-          imap
+        begin
+          imaps_test do |port|
+            imap = Net::IMAP.new(
+              server_addr,
+              port: port,
+              ssl: { :verify_mode => OpenSSL::SSL::VERIFY_NONE }
+            )
+            verified = imap.tls_verified?
+            imap
+          end
+        rescue OpenSSL::SSL::SSLError => e
+          raise e unless /darwin/ =~ RUBY_PLATFORM
         end
       end
       assert_equal false, verified