faster server starting in Redis tests

diff --git a/tests/support/server.tcl b/tests/support/server.tcl
index 24fef4677175cd4202836e48dfdb9a615a8bfacc..e5ca6c6cd69ffb664990c314bbcde90211c0d794 100644 (file)
--- a/tests/support/server.tcl
+++ b/tests/support/server.tcl
@@ -83,7 +83,9 @@ proc ping_server {host port} {
         }
         close $fd
     } e]} {
         }
         close $fd
     } e]} {

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

     }
     return $retval
 }
     }
     return $retval
 }


@@ -170,14 +172,33 @@ proc start_server {options {code undefined}} {
 
     if {$::valgrind} {
         exec valgrind src/redis-server $config_file > $stdout 2> $stderr &
 
     if {$::valgrind} {
         exec valgrind src/redis-server $config_file > $stdout 2> $stderr &

-        after 2000

     } 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 20
+    set serverisup 0
+
+    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
+    }
+    puts {}
+
+    if {!$serverisup} {

         error_and_quit $config_file [exec cat $stderr]
     }
     
         error_and_quit $config_file [exec cat $stderr]
     }
     

diff --git a/tests/unit/other.tcl b/tests/unit/other.tcl
index f0497b62c6596d870df81c43ae410ad0d2ff53d3..5967c722dd5fc5563d1642c14daa9e3ca5d07d79 100644 (file)
--- a/tests/unit/other.tcl
+++ b/tests/unit/other.tcl
@@ -1,4 +1,4 @@
-start_server {} {
+start_server {tags {"other"}} {

     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate
         waitForBgsave r
     test {SAVE - make sure there are all the types as values} {
         # Wait for a background saving in progress to terminate
         waitForBgsave r

diff --git a/tests/unit/protocol.tcl b/tests/unit/protocol.tcl
index 9eebf77fdf5d96e3e87cb169ce991c4ec243da96..5bf42d7feeed375b33d27efd81dbf5eef2d4d38d 100644 (file)
--- a/tests/unit/protocol.tcl
+++ b/tests/unit/protocol.tcl
@@ -1,4 +1,4 @@
-start_server {} {
+start_server {tags {"protocol"}} {

     test {Handle an empty query well} {
         set fd [r channel]
         puts -nonewline $fd "\r\n"
     test {Handle an empty query well} {
         set fd [r channel]
         puts -nonewline $fd "\r\n"