Permalink
Browse files

--quiet option implemented in the Redis test. Output improved a bit.

  • Loading branch information...
antirez committed Nov 29, 2011
1 parent 54a2934 commit 901120f8e6415699a72096fa30d9bac99c302c21
Showing with 25 additions and 9 deletions.
  1. +25 −9 tests/test_helper.tcl
View
@@ -41,6 +41,7 @@ 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
@@ -141,11 +142,11 @@ proc s {args} {
}
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.*]}
- puts "OK"
+ if {!$::quiet} {puts "OK"}
}
proc find_available_port start {
@@ -168,7 +169,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]
- 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
@@ -222,16 +225,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
@@ -245,7 +254,9 @@ proc read_from_test_client fd {
} elseif {$status eq {testing}} {
# No op
} else {
- puts "\[$status\]: $data"
+ if {!$::quiet} {
+ puts "\[$status\]: $data"
+ }
}
}
@@ -257,7 +268,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
@@ -321,6 +334,7 @@ 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."
"--force-failure Force the execution of a test that always fails."
@@ -343,6 +357,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

0 comments on commit 901120f

Please sign in to comment.