From 0bb787d3ad49977ed92dfe711f54494ed0abccdf Mon Sep 17 00:00:00 2001 From: antirez Date: Thu, 5 May 2016 09:45:31 +0200 Subject: [PATCH] Quick fix to avoid false positive in replica migration test. --- tests/cluster/tests/12-replica-migration-2.tcl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/cluster/tests/12-replica-migration-2.tcl b/tests/cluster/tests/12-replica-migration-2.tcl index 36a89d4bc..cd8b33b3e 100644 --- a/tests/cluster/tests/12-replica-migration-2.tcl +++ b/tests/cluster/tests/12-replica-migration-2.tcl @@ -45,11 +45,14 @@ test "Master #0 should lose its replicas" { } test "Resharding all the master #0 slots back to it" { + # Wait for the cluster config to propagate before attempting a + # new resharding. + after 10000 set output [exec \ ../../../src/redis-trib.rb rebalance \ --weight ${master0_id}=1 \ --use-empty-masters \ - 127.0.0.1:[get_instance_attrib redis 0 port]] + 127.0.0.1:[get_instance_attrib redis 0 port] >@ stdout] } test "Master #0 should re-acquire one or more replicas" {