X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/e4715f0011049b60ba96441e66d6fc87ff5a43d3..9c00f078978e452d541ddc8a9a2b7704db2cb7f3:/tests/test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index ce1af659..b2e58b44 100644
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -11,6 +11,7 @@ source tests/support/util.tcl
 
 set ::all_tests {
     unit/printver
+    unit/dump
     unit/auth
     unit/protocol
     unit/basic
@@ -23,23 +24,34 @@ set ::all_tests {
     unit/sort
     unit/expire
     unit/other
-    unit/cas
+    unit/multi
     unit/quit
+    unit/aofrw
     integration/replication
     integration/replication-2
     integration/replication-3
+    integration/replication-4
     integration/aof
+    integration/rdb
+    integration/convert-zipmap-hash-on-load
     unit/pubsub
     unit/slowlog
+    unit/scripting
+    unit/maxmemory
+    unit/introspection
+    unit/limits
+    unit/obuf-limits
+    unit/bitops
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0
 
 set ::host 127.0.0.1
-set ::port 16379
+set ::port 21111
 set ::traceleaks 0
 set ::valgrind 0
 set ::verbose 0
+set ::quiet 0
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance
@@ -110,7 +122,7 @@ proc reconnect {args} {
     }
 
     # re-set $srv in the servers list
-    set ::servers [lreplace $::servers end+$level 1 $srv]
+    lset ::servers end+$level $srv
 }
 
 proc redis_deferring_client {args} {
@@ -140,43 +152,47 @@ proc s {args} {
 }
 
 proc cleanup {} {
-    puts -nonewline "Cleanup: warning may take some time... "
+    if {!$::quiet} {puts -nonewline "Cleanup: may take some time... "}
     flush stdout
     catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
     catch {exec rm -rf {*}[glob tests/tmp/server.*]}
-    puts "OK"
+    if {!$::quiet} {puts "OK"}
+}
+
+proc find_available_port start {
+    for {set j $start} {$j < $start+1024} {incr j} {
+        if {[catch {
+            set fd [socket 127.0.0.1 $j]
+        }]} {
+            return $j
+        } else {
+            close $fd
+        }
+    }
+    if {$j == $start+1024} {
+        error "Can't find a non busy port in the $start-[expr {$start+1023}] range."
+    }
 }
 
 proc test_server_main {} {
     cleanup
     # Open a listening socket, trying different ports in order to find a
     # non busy one.
-    set port 11111
-    while 1 {
+    set port [find_available_port 11111]
+    if {!$::quiet} {
         puts "Starting test server at port $port"
-        if {[catch {socket -server accept_test_clients $port} e]} {
-            if {[string match {*address already in use*} $e]} {
-                if {$port == 20000} {
-                    puts "Can't find an available TCP port for test server."
-                    exit 1
-                } else {
-                    incr port
-                }
-            } else {
-                puts "Fatal error starting test server: $e"
-                exit 1
-            }
-        } else {
-            break
-        }
     }
+    socket -server accept_test_clients $port
 
     # Start the client instances
     set ::clients_pids {}
+    set start_port [expr {$::port+100}]
     for {set j 0} {$j < $::numclients} {incr j} {
+        set start_port [find_available_port $start_port]
         set p [exec tclsh8.5 [info script] {*}$::argv \
-            --client $port --port [expr {$::port+($j*10)}] &]
+            --client $port --port $start_port &]
         lappend ::clients_pids $p
+        incr start_port 10
     }
 
     # Setup global state for the test server
@@ -219,16 +235,22 @@ proc read_from_test_client fd {
     set payload [read $fd $bytes]
     foreach {status data} $payload break
     if {$status eq {ready}} {
-        puts "\[$status\]: $data"
+        if {!$::quiet} {
+            puts "\[$status\]: $data"
+        }
         signal_idle_client $fd
     } elseif {$status eq {done}} {
         set elapsed [expr {[clock seconds]-$::clients_start_time($fd)}]
-        puts "\[[colorstr yellow $status]\]: $data ($elapsed seconds)"
-        puts "+++ [expr {[llength $::active_clients]-1}] units still in execution."
+        set all_tests_count [llength $::all_tests]
+        set running_tests_count [expr {[llength $::active_clients]-1}]
+        set completed_tests_count [expr {$::next_test-$running_tests_count}]
+        puts "\[$completed_tests_count/$all_tests_count [colorstr yellow $status]\]: $data ($elapsed seconds)"
         lappend ::clients_time_history $elapsed $data
         signal_idle_client $fd
     } elseif {$status eq {ok}} {
-        puts "\[[colorstr green $status]\]: $data"
+        if {!$::quiet} {
+            puts "\[[colorstr green $status]\]: $data"
+        }
     } elseif {$status eq {err}} {
         set err "\[[colorstr red $status]\]: $data"
         puts $err
@@ -242,7 +264,9 @@ proc read_from_test_client fd {
     } elseif {$status eq {testing}} {
         # No op
     } else {
-        puts "\[$status\]: $data"
+        if {!$::quiet} {
+            puts "\[$status\]: $data"
+        }
     }
 }
 
@@ -254,7 +278,9 @@ proc signal_idle_client fd {
         [lsearch -all -inline -not -exact $::active_clients $fd]
     # New unit to process?
     if {$::next_test != [llength $::all_tests]} {
-        puts [colorstr bold-white "Testing [lindex $::all_tests $::next_test]"]
+        if {!$::quiet} {
+            puts [colorstr bold-white "Testing [lindex $::all_tests $::next_test]"]
+        }
         set ::clients_start_time($fd) [clock seconds]
         send_data_packet $fd run [lindex $::all_tests $::next_test]
         lappend ::active_clients $fd
@@ -281,9 +307,11 @@ proc the_end {} {
         foreach failed $::failed_tests {
             puts "*** $failed"
         }
+        cleanup
         exit 1
     } else {
         puts "\n[colorstr bold-white {\o/}] [colorstr bold-green {All tests passed without errors!}]\n"
+        cleanup
         exit 0
     }
 }
@@ -316,8 +344,10 @@ proc print_help_screen {} {
     puts [join {
         "--valgrind         Run the test over valgrind."
         "--accurate         Run slow randomized tests for more iterations."
+        "--quiet            Don't show individual tests."
         "--single <unit>    Just execute the specified unit (see next option)."
         "--list-tests       List all the available test units."
+        "--clients <num>    Number of test clients (16)."
         "--force-failure    Force the execution of a test that always fails."
         "--help             Print this help screen."
     } "\n"]
@@ -338,6 +368,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         incr j
     } elseif {$opt eq {--valgrind}} {
         set ::valgrind 1
+    } elseif {$opt eq {--quiet}} {
+        set ::quiet 1
     } elseif {$opt eq {--host}} {
         set ::external 1
         set ::host $arg
@@ -361,6 +393,9 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         set ::client 1
         set ::test_server_port $arg
         incr j
+    } elseif {$opt eq {--clients}} {
+        set ::numclients $arg
+        incr j
     } elseif {$opt eq {--help}} {
         print_help_screen
         exit 0
@@ -370,6 +405,18 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
     }
 }
 
+# With the parallel test running multiple Redis instances at the same time
+# we need a fast enough computer, otherwise a lot of tests may generate
+# false positives.
+# If the computer is too slow we revert the sequetial test without any
+# parallelism, that is, clients == 1.
+proc is_a_slow_computer {} {
+    set start [clock milliseconds]
+    for {set j 0} {$j < 1000000} {incr j} {}
+    set elapsed [expr [clock milliseconds]-$start]
+    expr {$elapsed > 200}
+}
+
 if {$::client} {
     if {[catch { test_client_main $::test_server_port } err]} {
         set estr "Executing test client: $err.\n$::errorInfo"
@@ -379,6 +426,11 @@ if {$::client} {
         exit 1
     }
 } else {
+    if {[is_a_slow_computer]} {
+        puts "** SLOW COMPUTER ** Using a single client to avoid false positives."
+        set ::numclients 1
+    }
+
     if {[catch { test_server_main } err]} {
         if {[string length $err] > 0} {
             # only display error when not generated by the test suite