diff options
| author | antirez <antirez@gmail.com> | 2015-01-22 16:31:41 +0100 |
|---|---|---|
| committer | antirez <antirez@gmail.com> | 2015-01-22 16:31:41 +0100 |
| commit | c7e31c681228e040a4bf83c8d7f6b774b177d68b (patch) | |
| tree | 91bc9b6154bd5153a28e490f67fbec44ad674776 | |
| parent | 096ad2e89dd3447875ae22fb49c2e9b41f5dc79d (diff) | |
| parent | 400ae01a7f5c0bb934266ee1ed073b5d55266d9f (diff) | |
| download | redis-c7e31c681228e040a4bf83c8d7f6b774b177d68b.tar.gz | |
Merge branch 'testing' into 3.0
| -rw-r--r-- | tests/cluster/tests/includes/init-tests.tcl | 7 |
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 } |