From 386804246f35e27a8db0d31fd0badd85cc6ecc04 Mon Sep 17 00:00:00 2001
From: antirez <antirez@gmail.com>
Date: Tue, 31 Mar 2015 23:43:38 +0200
Subject: [PATCH] Test: be more patient waiting for servers to exit.
This should likely fix a false positive when running with the --valgrind
option.
---
tests/support/server.tcl | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 317b40a84..e5c31af28 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -54,10 +54,15 @@ proc kill_server config {
# kill server and wait for the process to be totally exited
catch {exec kill $pid}
+ if {$::valgrind} {
+ set max_wait 60000
+ } else {
+ set max_wait 10000
+ }
while {[is_alive $config]} {
incr wait 10
- if {$wait >= 5000} {
+ if {$wait >= $max_wait} {
puts "Forcing process $pid to exit..."
catch {exec kill -KILL $pid}
} elseif {$wait % 1000 == 0} {