gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
antirez 2011-11-29 16:29:12 +01:00
parent 63fd13996d
commit 38b957d8ba
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/test_helper.tcl
View File

@ -42,6 +42,7 @@ set ::port 21111
set ::traceleaks 0 set ::traceleaks 0
set ::valgrind 0 set ::valgrind 0
set ::verbose 0 set ::verbose 0
set ::quiet 0
set ::denytags {} set ::denytags {}
set ::allowtags {} set ::allowtags {}
set ::external 0; # If "1" this means, we are running against external instance set ::external 0; # If "1" this means, we are running against external instance
@ -142,11 +143,11 @@ 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 flush stdout
catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]} catch {exec rm -rf {*}[glob tests/tmp/redis.conf.*]}
catch {exec rm -rf {*}[glob tests/tmp/server.*]} catch {exec rm -rf {*}[glob tests/tmp/server.*]}
puts "OK" if {!$::quiet} {puts "OK"}
} }
proc find_available_port start { proc find_available_port start {
@ -169,7 +170,9 @@ proc test_server_main {} {
# Open a listening socket, trying different ports in order to find a # Open a listening socket, trying different ports in order to find a
# non busy one. # non busy one.
set port [find_available_port 11111] set port [find_available_port 11111]
if {!$::quiet} {
puts "Starting test server at port $port" puts "Starting test server at port $port"
}
socket -server accept_test_clients $port socket -server accept_test_clients $port
# Start the client instances # Start the client instances
@ -223,16 +226,22 @@ proc read_from_test_client fd {
set payload [read $fd $bytes] set payload [read $fd $bytes]
foreach {status data} $payload break foreach {status data} $payload break
if {$status eq {ready}} { if {$status eq {ready}} {
if {!$::quiet} {
puts "\[$status\]: $data" puts "\[$status\]: $data"
}
signal_idle_client $fd signal_idle_client $fd
} elseif {$status eq {done}} { } elseif {$status eq {done}} {
set elapsed [expr {[clock seconds]-$::clients_start_time($fd)}] set elapsed [expr {[clock seconds]-$::clients_start_time($fd)}]
puts "\[[colorstr yellow $status]\]: $data ($elapsed seconds)" set all_tests_count [llength $::all_tests]
puts "+++ [expr {[llength $::active_clients]-1}] units still in execution." 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 lappend ::clients_time_history $elapsed $data
signal_idle_client $fd signal_idle_client $fd
} elseif {$status eq {ok}} { } elseif {$status eq {ok}} {
if {!$::quiet} {
puts "\[[colorstr green $status]\]: $data" puts "\[[colorstr green $status]\]: $data"
}
} elseif {$status eq {err}} { } elseif {$status eq {err}} {
set err "\[[colorstr red $status]\]: $data" set err "\[[colorstr red $status]\]: $data"
puts $err puts $err
@ -246,8 +255,10 @@ proc read_from_test_client fd {
} elseif {$status eq {testing}} { } elseif {$status eq {testing}} {
# No op # No op
} else { } else {
if {!$::quiet} {
puts "\[$status\]: $data" puts "\[$status\]: $data"
} }
}
} }
# A new client is idle. Remove it from the list of active clients and # A new client is idle. Remove it from the list of active clients and
@ -258,7 +269,9 @@ proc signal_idle_client fd {
[lsearch -all -inline -not -exact $::active_clients $fd] [lsearch -all -inline -not -exact $::active_clients $fd]
# New unit to process? # New unit to process?
if {$::next_test != [llength $::all_tests]} { if {$::next_test != [llength $::all_tests]} {
if {!$::quiet} {
puts [colorstr bold-white "Testing [lindex $::all_tests $::next_test]"] puts [colorstr bold-white "Testing [lindex $::all_tests $::next_test]"]
}
set ::clients_start_time($fd) [clock seconds] set ::clients_start_time($fd) [clock seconds]
send_data_packet $fd run [lindex $::all_tests $::next_test] send_data_packet $fd run [lindex $::all_tests $::next_test]
lappend ::active_clients $fd lappend ::active_clients $fd
@ -322,6 +335,7 @@ proc print_help_screen {} {
puts [join { puts [join {
"--valgrind Run the test over valgrind." "--valgrind Run the test over valgrind."
"--accurate Run slow randomized tests for more iterations." "--accurate Run slow randomized tests for more iterations."
"--quiet Don't show individual tests."
"--single <unit> Just execute the specified unit (see next option)." "--single <unit> Just execute the specified unit (see next option)."
"--list-tests List all the available test units." "--list-tests List all the available test units."
"--force-failure Force the execution of a test that always fails." "--force-failure Force the execution of a test that always fails."
@ -344,6 +358,8 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
incr j incr j
} elseif {$opt eq {--valgrind}} { } elseif {$opt eq {--valgrind}} {
set ::valgrind 1 set ::valgrind 1
} elseif {$opt eq {--quiet}} {
set ::quiet 1
} elseif {$opt eq {--host}} { } elseif {$opt eq {--host}} {
set ::external 1 set ::external 1
set ::host $arg set ::host $arg