Merge pull request #844 from redis/minitest

Convert test suite to use Minitest

Author: byroot

.travis.yml

@@ -14,8 +14,6 @@ rvm:
   - 2.5.3
   - jruby-9.1.17.0
 
-gemfile: ".travis/Gemfile"
-
 sudo: false
 
 before_script:

.travis/Gemfile

@@ -2,6 +2,9 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'rake'
+gem 'minitest'
+
 # Using jruby-openssl 0.10.0, we get NPEs in jruby tests: https://github.com/redis/redis-rb/issues/756
 platform :jruby do
   gem 'jruby-openssl', '<0.10.0'

Gemfile

@@ -0,0 +1,7 @@
+require 'rake/testtask'
+Rake::TestTask.new 'test' do |t|
+  t.libs = %w(lib test)
+  t.pattern = "test/*_test.rb"
+end
+
+task default: :test

Rakefile

@@ -1,5 +1,4 @@
-TEST_FILES         := $(shell find ./test -name *_test.rb -type f)
-REDIS_BRANCH       ?= unstable
+REDIS_BRANCH       ?= 5.0
 TMP                := tmp
 BUILD_DIR          := ${TMP}/cache/redis-${REDIS_BRANCH}
 TARBALL            := ${TMP}/redis-${REDIS_BRANCH}.tar.gz
@@ -47,9 +46,8 @@ ${TMP}:
 ${BINARY}: ${TMP}
 	bin/build ${REDIS_BRANCH} $<
 
-test: ${TEST_FILES}
-	env SOCKET_PATH=${SOCKET_PATH} \
-		bundle exec ruby -v -e 'ARGV.each { |test_file| require test_file }' ${TEST_FILES}
+test: 
+	env SOCKET_PATH=${SOCKET_PATH} rake test
 
 stop:
 	$(call kill-redis,${PID_PATH})
@@ -111,8 +109,8 @@ start_cluster: ${BINARY}
 	done
 
 create_cluster:
-	yes yes | ((bundle exec ruby ${REDIS_TRIB} create --replicas 1 ${CLUSTER_ADDRS}) || \
-		(${REDIS_CLIENT} --cluster create ${CLUSTER_ADDRS} --cluster-replicas 1))
+	yes yes | ((${REDIS_CLIENT} --cluster create ${CLUSTER_ADDRS} --cluster-replicas 1) || \
+		(bundle exec ruby ${REDIS_TRIB} create --replicas 1 ${CLUSTER_ADDRS}))
 
 clean:
 	(test -d ${BUILD_DIR} && cd ${BUILD_DIR}/src && make clean distclean) || true

makefile

@@ -35,7 +35,6 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.2.2'
 
-  s.add_development_dependency("test-unit", ">= 3.1.5")
   s.add_development_dependency("mocha")
   s.add_development_dependency("hiredis")
   s.add_development_dependency("em-synchrony")

redis.gemspec

@@ -1,6 +1,6 @@
 require_relative "helper"
 
-class TestBitpos < Test::Unit::TestCase
+class TestBitpos < Minitest::Test
 
   include Helper::Client
 

test/bitpos_test.rb

@@ -1,7 +1,7 @@
 require_relative 'helper'
 require_relative 'lint/blocking_commands'
 
-class TestBlockingCommands < Test::Unit::TestCase
+class TestBlockingCommands < Minitest::Test
   include Helper::Client
   include Lint::BlockingCommands
 

test/blocking_commands_test.rb

@@ -1,6 +1,6 @@
 require_relative "helper"
 
-class TestClient < Test::Unit::TestCase
+class TestClient < Minitest::Test
 
   include Helper::Client
 
@@ -37,7 +37,7 @@ def test_commit_raise
     r.queue("SET", "foo", "bar")
     r.queue("INCR")
 
-    assert_raise(Redis::CommandError) do
+    assert_raises(Redis::CommandError) do
       r.commit
     end
   end
@@ -46,7 +46,7 @@ def test_queue_after_error
     r.queue("SET", "foo", "bar")
     r.queue("INCR")
 
-    assert_raise(Redis::CommandError) do
+    assert_raises(Redis::CommandError) do
       r.commit
     end
 
@@ -66,11 +66,10 @@ def resolve
       end
     end
 
-    assert_raise_message(
-      'Error connecting to Redis on 127.0.0.5:999 (Errno::ECONNREFUSED)'
-    ) do
+    error = assert_raises do
       new_redis = _new_client(connector: custom_connector)
       new_redis.ping
     end
+    assert_equal 'Error connecting to Redis on 127.0.0.5:999 (Errno::ECONNREFUSED)', error.message
   end
 end

test/client_test.rb

@@ -3,12 +3,12 @@
 require_relative 'helper'
 
 # ruby -w -Itest test/cluster_abnormal_state_test.rb
-class TestClusterAbnormalState < Test::Unit::TestCase
+class TestClusterAbnormalState < Minitest::Test
   include Helper::Cluster
 
   def test_the_state_of_cluster_down
     redis_cluster_down do
-      assert_raise(Redis::CommandError, 'CLUSTERDOWN Hash slot not served') do
+      assert_raises(Redis::CommandError, 'CLUSTERDOWN Hash slot not served') do
         redis.set('key1', 1)
       end
 
@@ -31,7 +31,7 @@ def test_the_state_of_cluster_failover
   end
 
   def test_raising_error_when_nodes_are_not_cluster_mode
-    assert_raise(Redis::CannotConnectError, 'Redis client could not connect to any cluster nodes') do
+    assert_raises(Redis::CannotConnectError, 'Redis client could not connect to any cluster nodes') do
       build_another_client(cluster: %W[redis://127.0.0.1:#{PORT}])
     end
   end