Merge pull request #853 from supercaracal/fix-unstable-test-cases

Fix unstable test cases for CI

Author: byroot

Rakefile

@@ -1,7 +1,25 @@
 require 'rake/testtask'
 Rake::TestTask.new 'test' do |t|
+  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
+  end
+
   t.libs = %w(lib test)
-  t.pattern = "test/*_test.rb"
+
+  if ARGV.size == 1
+    t.pattern = 'test/*_test.rb'
+  else
+    t.test_files = ARGV[1..-1]
+  end
+
+  t.options = '-v'
 end
 
 task default: :test

bin/cluster_creater

@@ -0,0 +1,10 @@
+#!/usr/bin/env ruby
+
+# frozen_string_literal: true
+
+require_relative '../test/support/cluster/orchestrator'
+
+urls = ARGV.map { |host_port| "redis://#{host_port}" }
+orchestrator = ClusterOrchestrator.new(urls, timeout: 30.0)
+orchestrator.rebuild
+orchestrator.close

makefile

@@ -19,48 +19,48 @@ CLUSTER_CONF_PATHS := $(addprefix ${TMP}/nodes,$(addsuffix .conf,${CLUSTER_PORTS
 CLUSTER_ADDRS      := $(addprefix 127.0.0.1:,${CLUSTER_PORTS})
 
 define kill-redis
-  (ls $1 2> /dev/null && kill $$(cat $1) && rm -f $1) || true
+  (ls $1 > /dev/null 2>&1 && kill $$(cat $1) && rm -f $1) || true
 endef
 
 all:
-	make start_all
-	make test
-	make stop_all
+	@make --no-print-directory start_all
+	@make --no-print-directory test
+	@make --no-print-directory stop_all
 
 start_all:
-	make start
-	make start_slave
-	make start_sentinel
-	make start_cluster
-	make create_cluster
+	@make --no-print-directory start
+	@make --no-print-directory start_slave
+	@make --no-print-directory start_sentinel
+	@make --no-print-directory start_cluster
+	@make --no-print-directory create_cluster
 
 stop_all:
-	make stop_sentinel
-	make stop_slave
-	make stop
-	make stop_cluster
+	@make --no-print-directory stop_sentinel
+	@make --no-print-directory stop_slave
+	@make --no-print-directory stop
+	@make --no-print-directory stop_cluster
 
 ${TMP}:
-	mkdir -p $@
+	@mkdir -p $@
 
 ${BINARY}: ${TMP}
-	bin/build ${REDIS_BRANCH} $<
+	@bin/build ${REDIS_BRANCH} $<
 
 test: 
-	env SOCKET_PATH=${SOCKET_PATH} rake test
+	@env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test
 
 stop:
-	$(call kill-redis,${PID_PATH})
+	@$(call kill-redis,${PID_PATH})
 
 start: ${BINARY}
-	${BINARY}                     \
-		--daemonize  yes            \
-		--pidfile    ${PID_PATH}    \
-		--port       ${PORT}        \
+	@${BINARY}\
+		--daemonize  yes\
+		--pidfile    ${PID_PATH}\
+		--port       ${PORT}\
 		--unixsocket ${SOCKET_PATH}
 
 stop_slave:
-	$(call kill-redis,${SLAVE_PID_PATH})
+	@$(call kill-redis,${SLAVE_PID_PATH})
 
 start_slave: ${BINARY}
 	${BINARY}\
@@ -71,11 +71,11 @@ start_slave: ${BINARY}
 		--slaveof    127.0.0.1 ${PORT}
 
 stop_sentinel:
-	$(call kill-redis,${SENTINEL_PID_PATHS})
-	rm -f ${TMP}/sentinel*.conf || true
+	@$(call kill-redis,${SENTINEL_PID_PATHS})
+	@rm -f ${TMP}/sentinel*.conf || true
 
 start_sentinel: ${BINARY}
-	for port in ${SENTINEL_PORTS}; do\
+	@for port in ${SENTINEL_PORTS}; do\
 		conf=${TMP}/sentinel$$port.conf;\
 		touch $$conf;\
 		echo '' >  $$conf;\
@@ -91,29 +91,28 @@ start_sentinel: ${BINARY}
 	done
 
 stop_cluster:
-	$(call kill-redis,${CLUSTER_PID_PATHS})
-	rm -f appendonly.aof || true
-	rm -f ${CLUSTER_CONF_PATHS} || true
+	@$(call kill-redis,${CLUSTER_PID_PATHS})
+	@rm -f appendonly.aof || true
+	@rm -f ${CLUSTER_CONF_PATHS} || true
 
 start_cluster: ${BINARY}
-	for port in ${CLUSTER_PORTS}; do                    \
-		${BINARY}                                         \
-			--daemonize            yes                      \
-			--appendonly           yes                      \
-			--cluster-enabled      yes                      \
-			--cluster-config-file  ${TMP}/nodes$$port.conf  \
-			--cluster-node-timeout 5000                     \
-			--pidfile              ${TMP}/redis$$port.pid   \
-			--port                 $$port                   \
-			--unixsocket           ${TMP}/redis$$port.sock; \
+	@for port in ${CLUSTER_PORTS}; do\
+		${BINARY}\
+			--daemonize            yes\
+			--appendonly           yes\
+			--cluster-enabled      yes\
+			--cluster-config-file  ${TMP}/nodes$$port.conf\
+			--cluster-node-timeout 5000\
+			--pidfile              ${TMP}/redis$$port.pid\
+			--port                 $$port\
+			--unixsocket           ${TMP}/redis$$port.sock;\
 	done
 
 create_cluster:
-	yes yes | ((${REDIS_CLIENT} --cluster create ${CLUSTER_ADDRS} --cluster-replicas 1) || \
-		(bundle exec ruby ${REDIS_TRIB} create --replicas 1 ${CLUSTER_ADDRS}))
+	@bin/cluster_creater ${CLUSTER_ADDRS}
 
 clean:
-	(test -d ${BUILD_DIR} && cd ${BUILD_DIR}/src && make clean distclean) || true
+	@(test -d ${BUILD_DIR} && cd ${BUILD_DIR}/src && make clean distclean) || true
 
 .PHONY: all test stop start stop_slave start_slave stop_sentinel start_sentinel\
 	stop_cluster start_cluster create_cluster stop_all start_all clean

test/cluster_client_replicas_test.rb

@@ -13,10 +13,7 @@ def test_client_can_command_with_replica
       assert_equal 'OK', r.set("key#{i}", i)
     end
 
-    begin
-      r.wait(6, 5_000)
-    rescue Redis::TimeoutError
-    end
+    r.wait(1, TIMEOUT.to_i * 1000)
 
     100.times do |i|
       assert_equal i.to_s, r.get("key#{i}")
@@ -35,10 +32,7 @@ def test_some_reference_commands_are_sent_to_slaves_if_needed
 
     5.times { |i| r.set("key#{i}", i) }
 
-    begin
-      r.wait(6, 5_000)
-    rescue Redis::TimeoutError
-    end
+    r.wait(1, TIMEOUT.to_i * 1000)
 
     assert_equal %w[key0 key1 key2 key3 key4], r.keys
     assert_equal 5, r.dbsize

test/helper.rb

@@ -19,7 +19,7 @@
 
 PORT        = 6381
 DB          = 15
-TIMEOUT     = Float(ENV['TIMEOUT'] || 0.1)
+TIMEOUT     = Float(ENV['TIMEOUT'] || 1.0)
 LOW_TIMEOUT = Float(ENV['LOW_TIMEOUT'] || 0.01) # for blocking-command tests
 OPTIONS     = { port: PORT, db: DB, timeout: TIMEOUT }.freeze
 

test/support/cluster/orchestrator.rb

@@ -7,7 +7,13 @@ class ClusterOrchestrator
 
   def initialize(node_addrs, timeout: 30.0)
     raise 'Redis Cluster requires at least 3 master nodes.' if node_addrs.size < 3
-    @clients = node_addrs.map { |addr| Redis.new(url: addr, timeout: timeout) }
+    @clients = node_addrs.map do |addr|
+      Redis.new(url: addr,
+                timeout: timeout,
+                reconnect_attempts: 10,
+                reconnect_delay: 1.5,
+                reconnect_delay_max: 10.0)
+    end
     @timeout = timeout
   end