Improve reliability of non-MRI CI [changelog skip]

.github/workflows/non_mri.yml

@@ -18,16 +18,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ ubuntu-20.04, ubuntu-18.04, macos-10.15 ]
+        os: [ ubuntu-20.04, macos-10.15 ]
         ruby: [ jruby, jruby-head, truffleruby-head ]
         no-ssl: ['']
         include:
-          #- { os: ubuntu-18.04 , ruby: jruby-head, allow-failure: true }
+          - { os: ubuntu-20.04 , ruby: jruby-head, allow-failure: true }
           - { os: ubuntu-20.04 , ruby: jruby, no-ssl: ' no SSL' }
         exclude:
-          - { os: ubuntu-20.04 , ruby: jruby }
-          - { os: ubuntu-20.04 , ruby: jruby-head }
-          - { os: ubuntu-20.04 , ruby: truffleruby-head }
           - { os: macos-10.15  , ruby: jruby-head }
 
     steps:
@@ -59,7 +56,7 @@ jobs:
 
       - name: test
         id: test
-        timeout-minutes: 20
+        timeout-minutes: 15
         continue-on-error: ${{ matrix.allow-failure || false }}
         if: success() # only run if previous steps have succeeded
         run: bundle exec rake test:all

test/helper.rb

@@ -108,6 +108,8 @@ module TestSkips
 
   SIGNAL_LIST = Signal.list.keys.map(&:to_sym) - (Puma.windows? ? [:INT, :TERM] : [])
 
+  JRUBY_HEAD = Puma::IS_JRUBY && RUBY_DESCRIPTION =~ /SNAPSHOT/
+
   # usage: skip_unless_signal_exist? :USR2
   def skip_unless_signal_exist?(sig, bt: caller)
     signal = sig.to_s.sub(/\ASIG/, '').to_sym

test/helpers/integration.rb

@@ -208,7 +208,8 @@ def hot_restart_does_not_drop_connections(num_threads: 1, total_requests: 500)
             # client would see an empty response
             # Errno::EBADF Windows may not be able to make a connection
             mutex.synchronize { replies[:reset] += 1 }
-          rescue *refused
+          rescue *refused, IOError
+            # IOError intermittently thrown by Ubuntu, add to allow retry
             mutex.synchronize { replies[:refused] += 1 }
           rescue ::Timeout::Error
             mutex.synchronize { replies[:read_timeout] += 1 }

test/test_integration_cluster.rb

@@ -2,7 +2,7 @@
 require_relative "helpers/integration"
 
 class TestIntegrationCluster < TestIntegration
-  parallelize_me!
+  parallelize_me! if ::Puma.mri?
 
   def workers ; 2 ; end
 

test/test_integration_pumactl.rb

@@ -3,7 +3,7 @@
 
 class TestIntegrationPumactl < TestIntegration
   include TmpPath
-  parallelize_me!
+  parallelize_me! if ::Puma.mri?
 
   def workers ; 2 ; end
 

test/test_integration_single.rb

@@ -2,7 +2,7 @@
 require_relative "helpers/integration"
 
 class TestIntegrationSingle < TestIntegration
-  parallelize_me!
+  parallelize_me! if ::Puma.mri?
 
   def workers ; 0 ; end
 

test/test_puma_server.rb

@@ -3,7 +3,7 @@
 require "net/http"
 
 class TestPumaServer < Minitest::Test
-  parallelize_me!
+  parallelize_me! unless JRUBY_HEAD
 
   def setup
     @host = "127.0.0.1"

test/test_puma_server_ssl.rb

@@ -216,7 +216,8 @@ def test_http_rejection
 
     tcp = Thread.new do
       req_http = Net::HTTP::Get.new "/", {}
-      assert_raises(Errno::ECONNREFUSED, EOFError) do
+      # Net::ReadTimeout - TruffleRuby
+      assert_raises(Errno::ECONNREFUSED, EOFError, Net::ReadTimeout) do
         http.start.request(req_http) { |rep| body_http = rep.body }
       end
     end
@@ -245,7 +246,7 @@ def test_http_rejection
 
 # client-side TLS authentication tests
 class TestPumaServerSSLClient < Minitest::Test
-  parallelize_me!
+  parallelize_me! unless ::Puma.jruby?
 
   CERT_PATH = File.expand_path "../examples/puma/client-certs", __dir__
 
@@ -286,7 +287,8 @@ def assert_ssl_client_error_match(error, subject=nil, &blk)
         req = Net::HTTP::Get.new "/", {}
         http.request(req)
       end
-    rescue OpenSSL::SSL::SSLError, EOFError
+    rescue OpenSSL::SSL::SSLError, EOFError, Errno::ECONNRESET
+      # Errno::ECONNRESET TruffleRuby
       client_error = true
       # closes socket if open, may not close on error
       http.send :do_finish
@@ -302,7 +304,7 @@ def assert_ssl_client_error_match(error, subject=nil, &blk)
       assert_equal subject, events.cert.subject.to_s if subject
     end
   ensure
-    server.stop(true)
+    server.stop(true) if server
   end
 
   def test_verify_fail_if_no_client_cert