Merge pull request #726 from yamt/typo

[redis.git] / tests / support / server.tcl

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 984270adb1b47e803d4e44825b3114df08423792..2c2665b6449f41cbc5f5456f154eeab217e960bf 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -46,11 +46,16 @@ proc kill_server config {
     }
 
     # kill server and wait for the process to be totally exited
     }
 
     # kill server and wait for the process to be totally exited

+    catch {exec kill $pid}

     while {[is_alive $config]} {
     while {[is_alive $config]} {

-        if {[incr wait 10] % 1000 == 0} {
+        incr wait 10
+
+        if {$wait >= 5000} {
+            puts "Forcing process $pid to exit..."
+            catch {exec kill -KILL $pid}
+        } elseif {$wait % 1000 == 0} {

             puts "Waiting for process $pid to exit..."
         }
             puts "Waiting for process $pid to exit..."
         }

-        catch {exec kill $pid}

         after 10
     }
 
         after 10
     }
 


@@ -102,7 +107,7 @@ proc tags {tags code} {
 }
 
 proc start_server {options {code undefined}} {
 }
 
 proc start_server {options {code undefined}} {

-    # If we are runnign against an external server, we just push the
+    # If we are running against an external server, we just push the

     # host/port pair in the stack the first time
     if {$::external} {
         if {[llength $::servers] == 0} {
     # host/port pair in the stack the first time
     if {$::external} {
         if {[llength $::servers] == 0} {


@@ -247,7 +252,7 @@ proc start_server {options {code undefined}} {
 
         while 1 {
             # check that the server actually started and is ready for connections
 
         while 1 {
             # check that the server actually started and is ready for connections

-            if {[exec cat $stdout | grep "ready to accept" | wc -l] > 0} {
+            if {[exec grep "ready to accept" | wc -l < $stdout] > 0} {

                 break
             }
             after 10
                 break
             }
             after 10