diff options
author | Matt Stancliff <matt@genges.com> | 2014-05-23 13:54:29 -0400 |
---|---|---|
committer | antirez <antirez@gmail.com> | 2014-05-26 17:58:49 +0200 |
commit | 033d717295a7ffde72d00fac7bae6e992686feb8 (patch) | |
tree | ccfa0f206c7431f8591b0f45be2be8b592479126 | |
parent | 186adefd5651103308080aa1d53f01b982582446 (diff) | |
download | redis-033d717295a7ffde72d00fac7bae6e992686feb8.tar.gz |
Fix test framework to detect proper server PID
Previously the PID format was:
[PID] Timestamp
But it recently changed to:
PID:X Timestamp
The tcl testing framework was grabbing the PID from \[\d+\], but
that's not valid anymore.
Now we grab the pid from "PID: <PID>" in the part of Redis startup
output to the right of the ASCII logo.
-rw-r--r-- | tests/support/server.tcl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/support/server.tcl b/tests/support/server.tcl index edcbbcc5d..9f92ce31e 100644 --- a/tests/support/server.tcl +++ b/tests/support/server.tcl @@ -236,7 +236,7 @@ proc start_server {options {code undefined}} { # find out the pid while {![info exists pid]} { - regexp {\[(\d+)\]} [exec cat $stdout] _ pid + regexp {PID:\s(\d+)} [exec cat $stdout] _ pid after 100 } |