From 6c16ecaaaab0d933249aaaef49fe50afd373df83 Mon Sep 17 00:00:00 2001
From: Matt Stancliff <matt@genges.com>
Date: Fri, 23 May 2014 13:54:29 -0400
Subject: [PATCH] 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.
---
tests/support/server.tcl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
}