Migrate to megatest

.gitignore

@@ -7,6 +7,8 @@
 /hiredis-client/pkg/
 /spec/reports/
 /tmp/
+/log/
+
 /hiredis-client/tmp/
 /bin/toxiproxy-server
 *.so

.rubocop.yml

@@ -36,6 +36,9 @@ Lint/UnderscorePrefixedVariableName:
 Lint/EmptyBlock:
   Enabled: false
 
+Lint/ShadowedException:
+  Enabled: false
+
 Lint/DuplicateBranch:
   Enabled: false
 

Gemfile

@@ -5,7 +5,7 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in redis-client.gemspec
 gemspec name: "redis-client"
 
-gem "minitest"
+gem "megatest", github: "byroot/megatest"
 gem "rake", "~> 13.2"
 gem "rake-compiler"
 gem "rubocop"

Gemfile.lock

@@ -1,3 +1,9 @@
+GIT
+  remote: https://github.com/byroot/megatest.git
+  revision: 70e9948140eb888e02e810175d52d55b329db47d
+  specs:
+    megatest (0.1.1)
+
 PATH
   remote: .
   specs:
@@ -15,7 +21,6 @@ GEM
     hiredis (0.6.3-java)
     json (2.7.1)
     json (2.7.1-java)
-    minitest (5.25.1)
     parallel (1.24.0)
     parser (3.3.0.5)
       ast (~> 2.4.1)
@@ -58,7 +63,7 @@ DEPENDENCIES
   benchmark-ips
   byebug
   hiredis
-  minitest
+  megatest!
   rake (~> 13.2)
   rake-compiler
   redis (~> 4.6)

Rakefile

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require "rake/extensiontask"
-require "rake/testtask"
 require 'rubocop/rake_task'
 
 RuboCop::RakeTask.new
@@ -21,29 +20,30 @@ Rake::ExtensionTask.new do |ext|
   CLEAN.add("#{ext.ext_dir}/vendor/*.{a,o}")
 end
 
+require "megatest/test_task"
+
 namespace :test do
-  Rake::TestTask.new(:ruby) do |t|
-    t.libs << "test"
-    t.libs << "lib"
-    t.test_files = FileList["test/**/*_test.rb"].exclude("test/sentinel/*_test.rb")
-    t.options = '-v' if ENV['CI'] || ENV['VERBOSE']
-  end
+  jobs = ENV["JOBS"] || "4"
+  jobs = jobs && Process.respond_to?(:fork) ? ["-j", jobs] : []
+  extra_args = ["--max-retries", "1"] + jobs
 
-  Rake::TestTask.new(:sentinel) do |t|
-    t.libs << "test/sentinel"
-    t.libs << "test"
-    t.libs << "lib"
-    t.test_files = FileList["test/sentinel/*_test.rb"]
-    t.options = '-v' if ENV['CI'] || ENV['VERBOSE']
+  Megatest::TestTask.create(:ruby) do |t|
+    t.tests = FileList["test/**/*_test.rb"].exclude("test/sentinel/*_test.rb")
+    t.extra_args = extra_args
   end
 
-  Rake::TestTask.new(:hiredis) do |t|
+  Megatest::TestTask.create(:hiredis) do |t|
     t.libs << "test/hiredis"
-    t.libs << "test"
     t.libs << "hiredis-client/lib"
-    t.libs << "lib"
-    t.test_files = FileList["test/**/*_test.rb"].exclude("test/sentinel/*_test.rb")
-    t.options = '-v' if ENV['CI'] || ENV['VERBOSE']
+    t.tests = FileList["test/hiredis/test_helper.rb"] + FileList["test/**/*_test.rb"].exclude("test/sentinel/*_test.rb")
+    t.extra_args = extra_args
+    t.deps << :compile
+  end
+
+  Megatest::TestTask.create(:sentinel) do |t|
+    t.libs << "test/sentinel"
+    t.tests = ["test/sentinel"]
+    t.extra_args = extra_args
   end
 end
 

bin/megatest

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'megatest' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../Gemfile", __dir__)
+
+bundle_binstub = File.expand_path("bundle", __dir__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("megatest", "megatest")

test/hiredis/test_helper.rb

@@ -8,7 +8,12 @@
 unless RUBY_PLATFORM == "java"
   require "redis"
   require "hiredis"
-  Redis.new(host: Servers::HOST, port: Servers::REDIS.port, driver: :hiredis).ping
+
+  begin
+    Redis.new(driver: :hiredis).ping
+  rescue
+    nil # does not matter, we just want to load the library
+  end
 end
 
 require "hiredis-client"

test/redis_client/ractor_test.rb

@@ -3,6 +3,8 @@
 require "test_helper"
 
 class RactorTest < RedisClientTestCase
+  tag isolated: true
+
   def setup
     skip("Ractors are not supported on this Ruby version") unless defined?(::Ractor)
     skip("Hiredis is not Ractor safe") if RedisClient.default_driver.name == "RedisClient::HiredisConnection"

test/sentinel/sentinel_test.rb

@@ -7,12 +7,30 @@ class SentinelTest < RedisClientTestCase
     include ClientTestHelper
 
     def setup
+      @config = new_config
       super
       @config = new_config
     end
 
+    def check_server
+      retried = false
+      begin
+        @redis = @config.new_client
+        @redis.call("FLUSHDB")
+      rescue
+        if retried
+          raise
+        else
+          retried = true
+          Servers::SENTINEL_TESTS.reset
+          retry
+        end
+      end
+    end
+
     def teardown
       Servers::SENTINEL_TESTS.reset
+      super
     end
 
     def test_new_client
@@ -86,9 +104,9 @@ def test_unknown_master
     def test_unresolved_config
       client = @config.new_client
 
-      @config.stub(:server_url, -> { raise ConnectionError.with_config('this should not be called', @config) }) do
-        @config.stub(:resolved?, false) do
-          client.stub(:call, ->(_) { raise ConnectionError.with_config('call error', @config) }) do
+      stub(@config, :server_url, -> { raise ConnectionError.with_config('this should not be called', @config) }) do
+        stub(@config, :resolved?, false) do
+          stub(client, :call, ->(_) { raise ConnectionError.with_config('call error', @config) }) do
             error = assert_raises ConnectionError do
               client.call('PING')
             end
@@ -108,7 +126,7 @@ def test_master_failover_not_ready
         [["SENTINEL", "get-master-addr-by-name", "cache"], [Servers::REDIS_REPLICA.host, Servers::REDIS_REPLICA.port.to_s]],
         sentinel_refresh_command_mock,
       ])
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_raises FailoverError do
           client.call("PING")
@@ -126,7 +144,7 @@ def test_master_failover_ready
       replica = RedisClient.new(host: Servers::REDIS_REPLICA.host, port: Servers::REDIS_REPLICA.port)
       assert_equal "OK", replica.call("REPLICAOF", "NO", "ONE")
 
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_equal "PONG", client.call("PING")
 
@@ -145,7 +163,7 @@ def test_no_replicas
       sentinel_client_mock = SentinelClientMock.new([
         [["SENTINEL", "replicas", "cache"], []],
       ] * tries)
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         assert_raises ConnectionError do
           @config.new_client.call("PING")
         end
@@ -159,7 +177,7 @@ def test_replica_failover_not_ready
         [["SENTINEL", "replicas", "cache"], [response_hash("ip" => Servers::REDIS.host, "port" => Servers::REDIS.port.to_s, "flags" => "slave")]],
         [["SENTINEL", "replicas", "cache"], [response_hash("ip" => Servers::REDIS.host, "port" => Servers::REDIS.port.to_s, "flags" => "slave")]],
       ])
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_equal "PONG", client.call("PING")
 
@@ -180,7 +198,7 @@ def test_replica_failover_ready
         [["SENTINEL", "replicas", "cache"], [response_hash("ip" => Servers::REDIS_REPLICA.host, "port" => Servers::REDIS_REPLICA.port.to_s, "flags" => "slave")]],
       ])
 
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_equal "PONG", client.call("PING")
       end
@@ -199,7 +217,7 @@ def test_successful_connection_refreshes_sentinels_list
           additional_sentinels: [response_hash("ip" => new_sentinel_ip, "port" => new_sentinel_port.to_s)],
         ),
       ])
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_equal "PONG", client.call("PING")
       end
@@ -226,7 +244,7 @@ def test_sentinel_refresh_password
         ),
       ])
 
-      @config.stub(:sentinel_client, ->(_config) { sentinel_client_mock }) do
+      stub(@config, :sentinel_client, ->(_config) { sentinel_client_mock }) do
         client = @config.new_client
         assert_equal "PONG", client.call("PING")
       end

test/sentinel/test_helper.rb

@@ -5,6 +5,4 @@
 
 Servers.build_redis
 Servers::SENTINEL_TESTS.prepare
-
-require "minitest/autorun"
-Minitest.after_run { Servers::TESTS.shutdown }
+Servers.all = Servers::SENTINEL_TESTS

test/support/client_test_helper.rb

@@ -48,7 +48,18 @@ def setup
   private
 
   def check_server
-    @redis.call("flushdb", "async")
+    retried = false
+    begin
+      @redis.call("flushdb", "async")
+    rescue
+      if retried
+        raise
+      else
+        retried = true
+        Servers.reset
+        retry
+      end
+    end
   end
 
   def travel(seconds)