Skip to content

Commit ab3ee2c

Browse files
Fix total test count while running over loop (valkey-io#2524)
Command: `./runtest --single unit/bitops --loops 3` Unstable ``` [ignore]: large memory flag not provided [-1/1 done]: unit/bitops (4 seconds) [ignore]: large memory flag not provided [0/1 done]: unit/bitops (4 seconds) [ignore]: large memory flag not provided [1/1 done]: unit/bitops (4 seconds) The End Execution time of different units: 4 seconds - unit/bitops 4 seconds - unit/bitops 4 seconds - unit/bitops ``` After fix ``` [1/3 done]: unit/bitops (4 seconds) [ignore]: large memory flag not provided [2/3 done]: unit/bitops (4 seconds) [ignore]: large memory flag not provided [3/3 done]: unit/bitops (4 seconds) The End Execution time of different units: 4 seconds - unit/bitops 4 seconds - unit/bitops 4 seconds - unit/bitops ``` Signed-off-by: Sarthak Aggarwal <sarthagg@amazon.com>
1 parent 23112fa commit ab3ee2c

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tests/test_helper.tcl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ set ::log_req_res 0
9494
set ::force_resp3 0
9595
set ::solo_tests_count 0
9696
set ::debug_defrag 0
97+
set ::completed_tests 0
98+
set ::total_loops 1
9799

98100
# Expand a unit specification (test name, file, or directory) into a list
99101
# of canonical unit names relative to the tests directory.
@@ -449,10 +451,9 @@ proc read_from_test_client fd {
449451
signal_idle_client $fd
450452
} elseif {$status eq {done}} {
451453
set elapsed [expr {[clock seconds]-$::clients_start_time($fd)}]
452-
set all_tests_count [expr {[llength $::all_tests]+$::solo_tests_count}]
453-
set running_tests_count [expr {[llength $::active_clients]-1}]
454-
set completed_solo_tests_count [expr {$::solo_tests_count-[llength $::run_solo_tests]}]
455-
set completed_tests_count [expr {$::next_test-$running_tests_count+$completed_solo_tests_count}]
454+
incr ::completed_tests
455+
set all_tests_count [expr {[llength $::all_tests] * $::total_loops + $::solo_tests_count}]
456+
set completed_tests_count $::completed_tests
456457
puts "\[$completed_tests_count/$all_tests_count [colorstr yellow $status]\]: $data ($elapsed seconds)"
457458
lappend ::clients_time_history $elapsed $data
458459
unset ::active_clients_file($fd)
@@ -831,12 +832,14 @@ for {set j 0} {$j < [llength $argv]} {incr j} {
831832
set ::stop_on_failure 1
832833
} elseif {$opt eq {--loop}} {
833834
set ::loop 2147483647
835+
set ::total_loops $::loop
834836
} elseif {$opt eq {--loops}} {
835837
set ::loop $arg
836838
if {$::loop <= 0} {
837839
puts "Wrong argument: $opt, loops should be greater than 0"
838840
exit 1
839841
}
842+
set ::total_loops $::loop
840843
incr j
841844
} elseif {$opt eq {--timeout}} {
842845
set ::timeout $arg

0 commit comments

Comments
 (0)