Merge pull request #1121 from casperisfine/split-test-suites

Split sentinel, cluster and distributed test suites

Author: byroot

.rubocop.yml

@@ -117,6 +117,9 @@ Layout/RescueEnsureAlignment:
 Naming/HeredocDelimiterNaming:
   Enabled: false
 
+Naming/VariableNumber:
+  Enabled: false
+
 Naming/FileName:
   Enabled: false
 

Rakefile

@@ -16,20 +16,21 @@ Rake::TestTask.new :test do |t|
 end
 
 namespace :test do
-  task :set_socket_path do
-    if ENV['SOCKET_PATH'].nil?
-      sock_file = Dir.glob("#{__dir__}/**/redis.sock").first
-
-      if sock_file.nil?
-        puts '`SOCKET_PATH` environment variable required'
-        exit 1
-      end
-
-      ENV['SOCKET_PATH'] = sock_file
+  groups = %i(redis distributed sentinel cluster)
+  groups.each do |group|
+    Rake::TestTask.new(group) do |t|
+      t.libs << "test"
+      t.libs << "lib"
+      t.test_files = FileList["test/#{group}/**/*_test.rb"]
     end
   end
+
+  lost_tests = Dir["test/**/*_test.rb"] - groups.map { |g| Dir["test/#{g}/**/*_test.rb"] }.flatten
+  unless lost_tests.empty?
+    abort "The following test files are in no group:\n#{lost_tests.join("\n")}"
+  end
 end
 
-Rake::Task[:test].enhance(["test:set_socket_path"])
+task test: ["test:redis", "test:distributed", "test:sentinel", "test:cluster"]
 
 task default: :test

makefile

@@ -8,7 +8,7 @@ BINARY             := ${BUILD_DIR}/src/redis-server
 REDIS_CLIENT       := ${BUILD_DIR}/src/redis-cli
 REDIS_TRIB         := ${BUILD_DIR}/src/redis-trib.rb
 PID_PATH           := ${BUILD_DIR}/redis.pid
-SOCKET_PATH        := ${BUILD_DIR}/redis.sock
+SOCKET_PATH        := ${TMP}/redis.sock
 PORT               := 6381
 SLAVE_PORT         := 6382
 SLAVE_PID_PATH     := ${BUILD_DIR}/redis_slave.pid
@@ -38,7 +38,7 @@ ${BINARY}: ${TMP}
 	@bin/build ${REDIS_BRANCH} $<
 
 test:
-	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
+	@env REDIS_SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 
 stop:
 	@$(call kill-redis,${PID_PATH});\

test/cluster_abnormal_state_test.rb renamed to test/cluster/abnormal_state_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
+require "helper"
 
 # ruby -w -Itest test/cluster_abnormal_state_test.rb
 class TestClusterAbnormalState < Minitest::Test

test/cluster_blocking_commands_test.rb renamed to test/cluster/blocking_commands_test.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
-require_relative 'lint/blocking_commands'
+require "helper"
 
 # ruby -w -Itest test/cluster_blocking_commands_test.rb
 class TestClusterBlockingCommands < Minitest::Test

test/cluster_client_internals_test.rb renamed to test/cluster/client_internals_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
+require "helper"
 
 # ruby -w -Itest test/cluster_client_internals_test.rb
 class TestClusterClientInternals < Minitest::Test

test/cluster_client_key_hash_tags_test.rb renamed to test/cluster/client_key_hash_tags_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
+require "helper"
 
 # ruby -w -Itest test/cluster_client_key_hash_tags_test.rb
 class TestClusterClientKeyHashTags < Minitest::Test

test/cluster_client_options_test.rb renamed to test/cluster/client_options_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
+require "helper"
 
 # ruby -w -Itest test/cluster_client_pipelining_test.rb
 class TestClusterClientPipelining < Minitest::Test

test/cluster_client_pipelining_test.rb renamed to test/cluster/client_pipelining_test.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
+require "helper"
 
 # ruby -w -Itest test/cluster_client_replicas_test.rb
 class TestClusterClientReplicas < Minitest::Test