WATCH is now able to detect keys removed by FLUSHALL and FLUSHDB

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 8adce3e8754ca5acaebd88556b3b1e2f829199df..9bec2bc7f5a0b905c8212f10acce1d876a933d38 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -7,29 +7,78 @@ proc error_and_quit {config_file error} {
     exit 1
 }
 
+proc check_valgrind_errors stderr {
+    set fd [open $stderr]
+    set buf [read $fd]
+    close $fd
+
+    if {![regexp -- {ERROR SUMMARY: 0 errors} $buf] ||
+        ![regexp -- {definitely lost: 0 bytes} $buf]} {
+        puts "*** VALGRIND ERRORS ***"
+        puts $buf
+        puts "--- press enter to continue ---"
+        gets stdin
+    }
+}
+
 proc kill_server config {
+    # nevermind if its already dead
+    if {![is_alive $config]} { return }
     set pid [dict get $config pid]
 
     # check for leaks
     catch {
         if {[string match {*Darwin*} [exec uname -a]]} {
-            test {Check for memory leaks} {
+            test "Check for memory leaks (pid $pid)" {
                 exec leaks $pid
             } {*0 leaks*}
         }
     }
 
     # 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]} {
-            break
+    while {[is_alive $config]} {
+        if {[incr wait 10] % 1000 == 0} {
+            puts "Waiting for process $pid to exit..."
         }
+        catch {exec kill $pid}
         after 10
     }
+
+    # Check valgrind errors if needed
+    if {$::valgrind} {
+        check_valgrind_errors [dict get $config stderr]
+    }
 }
 
+proc is_alive config {
+    set pid [dict get $config pid]
+    if {[catch {exec ps -p $pid} err]} {
+        return 0
+    } else {
+        return 1
+    }
+}
+
+proc ping_server {host port} {
+    set retval 0
+    if {[catch {
+        set fd [socket $::host $::port]
+        fconfigure $fd -translation binary
+        puts $fd "PING\r\n"
+        flush $fd
+        set reply [gets $fd]
+        if {[string range $reply 0 4] eq {+PONG} ||
+            [string range $reply 0 3] eq {-ERR}} {
+            set retval 1
+        }
+        close $fd
+    } e]} {
+        puts "Can't PING server at $host:$port... $e"
+    }
+    return $retval
+}
+
+set ::global_overrides {}
 proc start_server {filename overrides {code undefined}} {
     set data [split [exec cat "tests/assets/$filename"] "\n"]
     set config {}
@@ -48,8 +97,8 @@ proc start_server {filename overrides {code undefined}} {
     # start every server on a different port
     dict set config port [incr ::port]
 
-    # apply overrides from arguments
-    foreach override $overrides {
+    # apply overrides from global space and arguments
+    foreach override [concat $::global_overrides $overrides] {
         set directive [lrange $override 0 0]
         set arguments [lrange $override 1 end]
         dict set config $directive $arguments
@@ -66,41 +115,31 @@ proc start_server {filename overrides {code undefined}} {
 
     set stdout [format "%s/%s" [dict get $config "dir"] "stdout"]
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
-    exec ./redis-server $config_file > $stdout 2> $stderr &
-    after 500
+
+    if {$::valgrind} {
+        exec valgrind ./redis-server $config_file > $stdout 2> $stderr &
+        after 2000
+    } else {
+        exec ./redis-server $config_file > $stdout 2> $stderr &
+        after 500
+    }
     
     # check that the server actually started
-    if {[file size $stderr] > 0} {
+    if {$code ne "undefined" && ![ping_server $::host $::port]} {
         error_and_quit $config_file [exec cat $stderr]
     }
     
-    set line [exec head -n1 $stdout]
-    if {[string match {*already in use*} $line]} {
-        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
+    while {![info exists pid]} {
+        regexp {^\[(\d+)\]} [exec head -n1 $stdout] _ pid
+        after 100
+    }
 
-    # create the client object
+    # setup properties to be able to initialize a client object
     set host $::host
     set port $::port
     if {[dict exists $config bind]} { set host [dict get $config bind] }
     if {[dict exists $config port]} { set port [dict get $config port] }
-    set client [redis $host $port]
-
-    # select the right db when we don't have to authenticate
-    if {![dict exists $config requirepass]} {
-        $client select 9
-    }
 
     # setup config dict
     dict set srv "config" $config_file
@@ -109,9 +148,31 @@ proc start_server {filename overrides {code undefined}} {
     dict set srv "port" $port
     dict set srv "stdout" $stdout
     dict set srv "stderr" $stderr
-    dict set srv "client" $client
 
+    # if a block of code is supplied, we wait for the server to become
+    # available, create a client object and kill the server afterwards
     if {$code ne "undefined"} {
+        set line [exec head -n1 $stdout]
+        if {[string match {*already in use*} $line]} {
+            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
+        }
+
+        set client [redis $host $port]
+        dict set srv "client" $client
+
+        # select the right db when we don't have to authenticate
+        if {![dict exists $config requirepass]} {
+            $client select 9
+        }
+
         # append the server to the stack
         lappend ::servers $srv