summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2015-01-22 16:08:21 +0100
committerantirez <antirez@gmail.com>2015-01-22 16:08:21 +0100
commitd5ba544e674cf7606f1d7fedf5802cd9bc4037f4 (patch)
tree9403376a60f095953ff26d0483b751f155646522
parenta330b6ca97dc92222e0405e6cbae552f5aa324eb (diff)
downloadredis-d5ba544e674cf7606f1d7fedf5802cd9bc4037f4.tar.gz
Cluster test: when valgrind is enabled, use a larger node-timeout.
Removes some percentage of timing related failures.
-rw-r--r--tests/cluster/tests/includes/init-tests.tcl7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/cluster/tests/includes/init-tests.tcl b/tests/cluster/tests/includes/init-tests.tcl
index 117f79208..466ab8f25 100644
--- a/tests/cluster/tests/includes/init-tests.tcl
+++ b/tests/cluster/tests/includes/init-tests.tcl
@@ -27,12 +27,17 @@ test "Cluster nodes are reachable" {
test "Cluster nodes hard reset" {
foreach_redis_id id {
+ if {$::valgrind} {
+ set node_timeout 10000
+ } else {
+ set node_timeout 3000
+ }
catch {R $id flushall} ; # May fail for readonly slaves.
R $id MULTI
R $id cluster reset hard
R $id cluster set-config-epoch [expr {$id+1}]
R $id EXEC
- R $id config set cluster-node-timeout 3000
+ R $id config set cluster-node-timeout $node_timeout
R $id config set cluster-slave-validity-factor 10
R $id config rewrite
}