summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2016-05-05 09:45:31 +0200
committerantirez <antirez@gmail.com>2016-05-05 09:45:31 +0200
commit0bb787d3ad49977ed92dfe711f54494ed0abccdf (patch)
treeaa783732cd6d5a7f98ea2348f52a4965dfd9a1b8 /tests
parentd827dbfda770d040d23802fb462487eea3699f0b (diff)
downloadredis-0bb787d3ad49977ed92dfe711f54494ed0abccdf.tar.gz
Quick fix to avoid false positive in replica migration test.
Diffstat (limited to 'tests')
-rw-r--r--tests/cluster/tests/12-replica-migration-2.tcl5
1 files changed, 4 insertions, 1 deletions
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" {