summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2014-05-07 15:57:32 +0200
committerantirez <antirez@gmail.com>2014-05-07 16:12:32 +0200
commit088b9eadc430401df38cc7546ffa3156b71a0cd3 (patch)
tree72c9499004f6f91ab873ed16b3fddb309d3b19c8
parent4f686555ce962e6632235d824512ea8fdeda003c (diff)
downloadredis-088b9eadc430401df38cc7546ffa3156b71a0cd3.tar.gz
Test: handle new osx 'leaks' error.
Sometimes the process is still there but no longer in a state that can be checked (after being killed). This used to happen after a call to SHUTDOWN NOSAVE in the scripting unit, causing a false positive.
-rw-r--r--tests/support/server.tcl3
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index de4f66db0..edcbbcc5d 100644
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -40,7 +40,8 @@ proc kill_server config {
test "Check for memory leaks (pid $pid)" {
set output {0 leaks}
catch {exec leaks $pid} output
- if {[string match {*process does not exist*} $output]} {
+ if {[string match {*process does not exist*} $output] ||
+ [string match {*cannot examine*} $output]} {
# In a few tests we kill the server process.
set output "0 leaks"
}