X-Git-Url: https://git.saurik.com/redis.git/blobdiff_plain/dcdfd005a0133a347cc0aae54c690cd8c845fed7..0f51e3c5640c2f5be2766f10660f668bc71c7dd9:/tests/test_helper.tcl?ds=sidebyside diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl index 4f3cf01e..7978d8a4 100644 --- a/tests/test_helper.tcl +++ b/tests/test_helper.tcl @@ -25,23 +25,30 @@ set ::all_tests { unit/other unit/cas 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/obuf-limits } # 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 @@ -112,7 +119,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} { @@ -142,43 +149,47 @@ 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 { + 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 @@ -221,16 +232,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 @@ -244,7 +261,9 @@ proc read_from_test_client fd { } elseif {$status eq {testing}} { # No op } else { - puts "\[$status\]: $data" + if {!$::quiet} { + puts "\[$status\]: $data" + } } } @@ -256,7 +275,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 @@ -320,6 +341,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 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." @@ -342,6 +364,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