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:17:11 +0200
commit093eab56de543cb8cc6dc505de2b8d9f2af9e77b (patch)
treea0dddd4f31627b6c3f2c4d0a431d29308b49a25e
parent32971f625178e308148b04d78c828f551e59d2ce (diff)
downloadredis-093eab56de543cb8cc6dc505de2b8d9f2af9e77b.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"
}