Even inside #if 0 comments are comments.

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

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 0c9f48ce9cd30caec2db51b325133836f94cde9f..b1ab38fc1089afcfae386c14d16f5ff041fecc3f 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -1,13 +1,15 @@
 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"
-    puts "CONFIGURATION:"
-    puts [exec cat $config_file]
-    puts "\nERROR:"
-    puts [string trim $error]
-    exit 1
+proc start_server_error {config_file error} {
+    set err {}
+    append err "Cant' start the Redis server\n"
+    append err "CONFIGURATION:"
+    append err [exec cat $config_file]
+    append err "\nERROR:"
+    append err [string trim $error]
+    send_data_packet $::test_server_fd err $err

 }
 
 proc check_valgrind_errors stderr {
 }
 
 proc check_valgrind_errors stderr {


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

     }
 }
 
 proc kill_server config {
     }
 }
 
 proc kill_server config {

+    # nothing to kill when running against external server
+    if {$::external} return
+

     # nevermind if its already dead
     if {![is_alive $config]} { return }
     set pid [dict get $config pid]
     # nevermind if its already dead
     if {![is_alive $config]} { return }
     set pid [dict get $config pid]


@@ -43,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
     }
 


@@ -80,7 +88,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
 }


@@ -93,6 +107,24 @@ 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
+    # host/port pair in the stack the first time
+    if {$::external} {
+        if {[llength $::servers] == 0} {
+            set srv {}
+            dict set srv "host" $::host
+            dict set srv "port" $::port
+            set client [redis $::host $::port]
+            dict set srv "client" $client
+            $client select 9
+
+            # append the server to the stack
+            lappend ::servers $srv
+        }
+        uplevel 1 $code
+        return
+    }
+

     # setup defaults
     set baseconfig "default.conf"
     set overrides {}
     # setup defaults
     set baseconfig "default.conf"
     set overrides {}


@@ -128,7 +160,8 @@ proc start_server {options {code undefined}} {
     dict set config dir [tmpdir server]
     
     # start every server on a different port
     dict set config dir [tmpdir server]
     
     # start every server on a different port

-    dict set config port [incr ::port]
+    set ::port [find_available_port [expr {$::port+1}]]
+    dict set config port $::port

 
     # apply overrides from global space and arguments
     foreach {directive arguments} [concat $::global_overrides $overrides] {
 
     # apply overrides from global space and arguments
     foreach {directive arguments} [concat $::global_overrides $overrides] {


@@ -148,21 +181,49 @@ 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 ./redis-server $config_file > $stdout 2> $stderr &
-        after 2000
+        exec valgrind --suppressions=src/valgrind.sup --show-reachable=no --show-possibly-lost=no --leak-check=full src/redis-server $config_file > $stdout 2> $stderr &

     } else {
     } else {

-        exec ./redis-server $config_file > $stdout 2> $stderr &
-        after 500
+        exec src/redis-server $config_file > $stdout 2> $stderr &

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

-    if {$code ne "undefined" && ![ping_server $::host $::port]} {
-        error_and_quit $config_file [exec cat $stderr]
+    # ugly but tries to be as fast as possible...
+    if {$::valgrind} {set retrynum 1000} else {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} {
+        set err {}
+        append err [exec cat $stdout] "\n" [exec cat $stderr]
+        start_server_error $config_file $err
+        return

     }
     
     # find out the pid
     while {![info exists pid]} {
     }
     
     # 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
     }
 


@@ -173,7 +234,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


@@ -196,48 +258,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 {