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

display less useless information in parallel test

Browse Source
This commit is contained in:
antirez 2011-07-11 00:14:12 +02:00
parent 3744824c3e
commit 82e5dd35ea
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/support/test.tcl
View File

@ -51,6 +51,11 @@ proc color_term {} {
proc colorstr {color str} { proc colorstr {color str} {
if {[color_term]} { if {[color_term]} {
set b 0
if {[string range $color 0 4] eq {bold-}} {
set b 1
set color [string range $color 5 end]
}
switch $color { switch $color {
red {set colorcode {31}} red {set colorcode {31}}
green {set colorcode {32}} green {set colorcode {32}}
@ -58,10 +63,11 @@ proc colorstr {color str} {
blue {set colorcode {34}} blue {set colorcode {34}}
magenta {set colorcode {35}} magenta {set colorcode {35}}
cyan {set colorcode {36}} cyan {set colorcode {36}}
else {set colorcode {37}} white {set colorcode {37}}
default {set colorcode {37}}
} }
if {$colorcode ne {}} { if {$colorcode ne {}} {
return "\033\[0;${colorcode};40m$str\033\[0m" return "\033\[$b;${colorcode};40m$str\033\[0m"
} }
} else { } else {
return $str return $str

12
tests/test_helper.tcl
View File

@ -210,20 +210,20 @@ 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}} {
puts "($fd) \[$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 "($fd) \[[colorstr yellow $status]\]: $data ($elapsed seconds)" puts "\[[colorstr yellow $status]\]: $data ($elapsed seconds)"
puts "+++ [llength $::active_clients] units still in execution." puts "+++ [llength $::active_clients] units still in execution."
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}} {
puts "($fd) \[[colorstr green $status]\]: $data" puts "\[[colorstr green $status]\]: $data"
} elseif {$status eq {err}} { } elseif {$status eq {err}} {
puts "($fd) \[[colorstr red $status]\]: $data" puts "\[[colorstr red $status]\]: $data"
} else { } else {
puts "($fd) \[$status\]: $data" puts "\[$status\]: $data"
} }
} }
@ -235,7 +235,7 @@ 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]} {
puts "Spawing new test process for: [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