Contextualize comment.

[redis.git] / tests / test_helper.tcl

diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl
index dd91d2cbb08b9a2cbff1db5c0d1e4d86e8396d01..4954b79e5b5547ec0c0f6158603fbae32008efe1 100644 (file)
--- a/tests/test_helper.tcl
+++ b/tests/test_helper.tcl
@@ -25,14 +25,18 @@ set ::all_tests {
     unit/other
     unit/cas
     unit/quit
     unit/other
     unit/cas
     unit/quit

+    unit/aofrw

     integration/replication
     integration/replication-2
     integration/replication-3
     integration/aof
     integration/replication
     integration/replication-2
     integration/replication-3
     integration/aof

+    integration/rdb

     unit/pubsub
     unit/slowlog
     unit/scripting
     unit/maxmemory
     unit/pubsub
     unit/slowlog
     unit/scripting
     unit/maxmemory

+    unit/introspection
+    unit/obuf-limits

 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0
 }
 # Index to the next test to run in the ::all_tests list.
 set ::next_test 0


@@ -42,6 +46,7 @@ set ::port 21111
 set ::traceleaks 0
 set ::valgrind 0
 set ::verbose 0
 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
 set ::denytags {}
 set ::allowtags {}
 set ::external 0; # If "1" this means, we are running against external instance


@@ -112,7 +117,7 @@ proc reconnect {args} {
     }
 
     # re-set $srv in the servers list
     }
 
     # 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} {
 }
 
 proc redis_deferring_client {args} {


@@ -142,19 +147,19 @@ proc s {args} {
 }
 
 proc cleanup {} {
 }
 
 proc cleanup {} {

-    puts -nonewline "Cleanup: 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.*]}
     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 {
 }
 
 proc find_available_port start {
     for {set j $start} {$j < $start+1024} {incr j} {
         if {[catch {

-            set fd [socket 127.0.0.1 $start]
+            set fd [socket 127.0.0.1 $j]

         }]} {
         }]} {

-            return $start
+            return $j

         } else {
             close $fd
         }
         } else {
             close $fd
         }


@@ -169,7 +174,9 @@ proc test_server_main {} {
     # Open a listening socket, trying different ports in order to find a
     # non busy one.
     set port [find_available_port 11111]
     # Open a listening socket, trying different ports in order to find a
     # non busy one.
     set port [find_available_port 11111]

-    puts "Starting test server at port $port"
+    if {!$::quiet} {
+        puts "Starting test server at port $port"
+    }

     socket -server accept_test_clients $port
 
     # Start the client instances
     socket -server accept_test_clients $port
 
     # Start the client instances


@@ -223,16 +230,22 @@ proc read_from_test_client fd {
     set payload [read $fd $bytes]
     foreach {status data} $payload break
     if {$status eq {ready}} {
     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)}]
         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}} {
         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
     } elseif {$status eq {err}} {
         set err "\[[colorstr red $status]\]: $data"
         puts $err


@@ -246,7 +259,9 @@ proc read_from_test_client fd {
     } elseif {$status eq {testing}} {
         # No op
     } else {
     } elseif {$status eq {testing}} {
         # No op
     } else {

-        puts "\[$status\]: $data"
+        if {!$::quiet} {
+            puts "\[$status\]: $data"
+        }

     }
 }
 
     }
 }
 


@@ -258,7 +273,9 @@ proc signal_idle_client fd {
         [lsearch -all -inline -not -exact $::active_clients $fd]
     # New unit to process?
     if {$::next_test != [llength $::all_tests]} {
         [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
         set ::clients_start_time($fd) [clock seconds]
         send_data_packet $fd run [lindex $::all_tests $::next_test]
         lappend ::active_clients $fd


@@ -322,6 +339,7 @@ proc print_help_screen {} {
     puts [join {
         "--valgrind         Run the test over valgrind."
         "--accurate         Run slow randomized tests for more iterations."
     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."
         "--force-failure    Force the execution of a test that always fails."
         "--single <unit>    Just execute the specified unit (see next option)."
         "--list-tests       List all the available test units."
         "--force-failure    Force the execution of a test that always fails."


@@ -344,6 +362,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
         incr j
     } elseif {$opt eq {--valgrind}} {
         set ::valgrind 1
         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
     } elseif {$opt eq {--host}} {
         set ::external 1
         set ::host $arg