From 9b6bb14eb5f4efbdd6670f50e02c76a42c529597 Mon Sep 17 00:00:00 2001 From: Yossi Gottlieb Date: Tue, 30 Mar 2021 23:33:01 +0300 Subject: [PATCH] Cluster migration test cleanup. (#8726) * Dump more output on error (always, cluster tests currently have no verbose flag). * Slow down redis-cli check iteration. --- tests/cluster/tests/includes/utils.tcl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/cluster/tests/includes/utils.tcl b/tests/cluster/tests/includes/utils.tcl index 202db7350..53849f87d 100644 --- a/tests/cluster/tests/includes/utils.tcl +++ b/tests/cluster/tests/includes/utils.tcl @@ -4,14 +4,15 @@ proc fix_cluster {addr} { set code [catch { exec ../../../src/redis-cli {*}[rediscli_tls_config "../../../tests"] --cluster fix $addr << yes } result] - if {$code != 0 && $::verbose} { + if {$code != 0} { puts $result } assert {$code == 0} assert_cluster_state ok - wait_for_condition 1000 10 { - [catch {exec ../../../src/redis-cli {*}[rediscli_tls_config "../../../tests"] --cluster check $addr} _] == 0 + wait_for_condition 100 100 { + [catch {exec ../../../src/redis-cli {*}[rediscli_tls_config "../../../tests"] --cluster check $addr} result] == 0 } else { + puts $result fail "Cluster could not settle with configuration" } }