Minor spelling fixes

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 8e226a7dd22a3638c149efaedcf17726700bb03e..3fa1725f3cc2371431b8878923cb9dc114cf6388 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -1,5 +1,6 @@
 set ::global_overrides {}
 set ::tags {}
 set ::global_overrides {}
 set ::tags {}

+set ::valgrind_errors {}

 
 proc error_and_quit {config_file error} {
     puts "!!COULD NOT START REDIS-SERVER\n"
 
 proc error_and_quit {config_file error} {
     puts "!!COULD NOT START REDIS-SERVER\n"


@@ -16,11 +17,9 @@ proc check_valgrind_errors stderr {
     close $fd
 
     if {![regexp -- {ERROR SUMMARY: 0 errors} $buf] ||
     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
+        (![regexp -- {definitely lost: 0 bytes} $buf] &&
+         ![regexp -- {no leaks are possible} $buf])} {
+        send_data_packet $::test_server_fd err "Valgrind error: $buf\n"

     }
 }
 
     }
 }
 


@@ -83,7 +82,13 @@ proc ping_server {host port} {
         }
         close $fd
     } e]} {
         }
         close $fd
     } e]} {

-        puts "Can't PING server at $host:$port... $e"
+        if {$::verbose} {
+            puts -nonewline "."
+        }
+    } else {
+        if {$::verbose} {
+            puts -nonewline "ok"
+        }

     }
     return $retval
 }
     }
     return $retval
 }


@@ -169,21 +174,46 @@ proc start_server {options {code undefined}} {
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
 
     if {$::valgrind} {
     set stderr [format "%s/%s" [dict get $config "dir"] "stderr"]
 
     if {$::valgrind} {

-        exec valgrind src/redis-server $config_file > $stdout 2> $stderr &
-        after 2000
+        exec valgrind --suppressions=src/valgrind.sup src/redis-server $config_file > $stdout 2> $stderr &

     } else {
         exec src/redis-server $config_file > $stdout 2> $stderr &
     } else {
         exec src/redis-server $config_file > $stdout 2> $stderr &

-        after 500

     }
     
     # check that the server actually started
     }
     
     # check that the server actually started

-    if {$code ne "undefined" && ![ping_server $::host $::port]} {
+    # ugly but tries to be as fast as possible...
+    set retrynum 100
+    set serverisup 0
+
+    if {$::verbose} {
+        puts -nonewline "=== ($tags) Starting server ${::host}:${::port} "
+    }
+
+    after 10
+    if {$code ne "undefined"} {
+        while {[incr retrynum -1]} {
+            catch {
+                if {[ping_server $::host $::port]} {
+                    set serverisup 1
+                }
+            }
+            if {$serverisup} break
+            after 50
+        }
+    } else {
+        set serverisup 1
+    }
+
+    if {$::verbose} {
+        puts ""
+    }
+
+    if {!$serverisup} {

         error_and_quit $config_file [exec cat $stderr]
     }
     
     # find out the pid
     while {![info exists pid]} {
         error_and_quit $config_file [exec cat $stderr]
     }
     
     # find out the pid
     while {![info exists pid]} {

-        regexp {^\[(\d+)\]} [exec head -n1 $stdout] _ pid
+        regexp {\[(\d+)\]} [exec cat $stdout] _ pid

         after 100
     }
 
         after 100
     }
 


@@ -194,7 +224,8 @@ proc start_server {options {code undefined}} {
     if {[dict exists $config port]} { set port [dict get $config port] }
 
     # setup config dict
     if {[dict exists $config port]} { set port [dict get $config port] }
 
     # setup config dict

-    dict set srv "config" $config_file
+    dict set srv "config_file" $config_file
+    dict set srv "config" $config

     dict set srv "pid" $pid
     dict set srv "host" $host
     dict set srv "port" $port
     dict set srv "pid" $pid
     dict set srv "host" $host
     dict set srv "port" $port


@@ -217,48 +248,42 @@ proc start_server {options {code undefined}} {
             after 10
         }
 
             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
         # append the server to the stack
         lappend ::servers $srv

-        
+
+        # connect client (after server dict is put on the stack)
+        reconnect
+

         # execute provided block
         # execute provided block

-        set curnum $::testnum
-        catch { uplevel 1 $code } err
-        if {$curnum == $::testnum} {
-            # don't check for leaks when no tests were executed
+        set num_tests $::num_tests
+        if {[catch { uplevel 1 $code } error]} {
+            set backtrace $::errorInfo
+
+            # Kill the server without checking for leaks

             dict set srv "skipleaks" 1
             dict set srv "skipleaks" 1

-        }
+            kill_server $srv

 
 

-        # pop the server object
-        set ::servers [lrange $::servers 0 end-1]
-        
-        # allow an exception to bubble up the call chain but still kill this
-        # server, because we want to reuse the ports when the tests are re-run
-        if {$err eq "exception"} {
-            puts [format "Logged warnings (pid %d):" [dict get $srv "pid"]]
+            # Print warnings from log
+            puts [format "\nLogged warnings (pid %d):" [dict get $srv "pid"]]

             set warnings [warnings_from_file [dict get $srv "stdout"]]
             if {[string length $warnings] > 0} {
                 puts "$warnings"
             } else {
                 puts "(none)"
             }
             set warnings [warnings_from_file [dict get $srv "stdout"]]
             if {[string length $warnings] > 0} {
                 puts "$warnings"
             } else {
                 puts "(none)"
             }

-            # kill this server without checking for leaks
+            puts ""
+
+            error $error $backtrace
+        }
+
+        # Don't do the leak check when no tests were run
+        if {$num_tests == $::num_tests} {

             dict set srv "skipleaks" 1
             dict set srv "skipleaks" 1

-            kill_server $srv
-            error "exception"
-        } elseif {[string length $err] > 0} {
-            puts "Error executing the suite, aborting..."
-            puts $err
-            exit 1

         }
 
         }
 

+        # pop the server object
+        set ::servers [lrange $::servers 0 end-1]
+

         set ::tags [lrange $::tags 0 end-[llength $tags]]
         kill_server $srv
     } else {
         set ::tags [lrange $::tags 0 end-[llength $tags]]
         kill_server $srv
     } else {