From: Pieter Noordhuis <pcnoordhuis@gmail.com>
Date: Fri, 14 May 2010 16:08:53 +0000 (+0200)
Subject: wait for redis-server to be settled and ready for connections
X-Git-Url: https://git.saurik.com/redis.git/commitdiff_plain/47868511523c855799c315977b5d480f6f15a4be

wait for redis-server to be settled and ready for connections
---

diff --git a/test/support/server.tcl b/test/support/server.tcl
index 53ca4683..7f95c4a9 100644
--- a/test/support/server.tcl
+++ b/test/support/server.tcl
@@ -22,9 +22,9 @@ proc kill_server config {
     # kill server and wait for the process to be totally exited
     exec kill $pid
     while 1 {
+        # with a non-zero exit status, the process is gone
         if {[catch {exec ps -p $pid | grep redis-server} result]} {
-            # non-zero exis status, process is gone
-            break;
+            break
         }
         after 10
     }
@@ -79,6 +79,14 @@ proc start_server {filename overrides {code undefined}} {
         error_and_quit $config_file $line
     }
 
+    while 1 {
+        # check that the server actually started and is ready for connections
+        if {[exec cat $stdout | grep "ready to accept" | wc -l] > 0} {
+            break
+        }
+        after 10
+    }
+
     # find out the pid
     regexp {^\[(\d+)\]} [exec head -n1 $stdout] _ pid