@@ -64,6 +64,7 @@ def __init__(self):
64
64
# tests
65
65
self .tests = []
66
66
self .selected = []
67
+ self .all_runtests : list [RunTests ] = []
67
68
68
69
# test results
69
70
self .good = []
@@ -350,6 +351,7 @@ def _rerun_failed_tests(self, need_rerun):
350
351
# Re-run failed tests
351
352
self .log (f"Re-running { len (tests )} failed tests in verbose mode in subprocesses" )
352
353
runtests = RunTests (tests , match_tests = match_tests , rerun = True )
354
+ self .all_runtests .append (runtests )
353
355
self ._run_tests_mp (runtests )
354
356
355
357
def rerun_failed_tests (self , need_rerun ):
@@ -621,6 +623,7 @@ def run_tests(self):
621
623
tests = self .selected
622
624
self .set_tests (tests )
623
625
runtests = RunTests (tests , forever = self .ns .forever )
626
+ self .all_runtests .append (runtests )
624
627
if self .ns .use_mp :
625
628
self ._run_tests_mp (runtests )
626
629
else :
@@ -646,6 +649,9 @@ def finalize(self):
646
649
647
650
def display_summary (self ):
648
651
duration = time .perf_counter () - self .start_time
652
+ first_runtests = self .all_runtests [0 ]
653
+ # re-run tests disables forever
654
+ forever = first_runtests .forever
649
655
650
656
# Total duration
651
657
print ()
@@ -661,22 +667,25 @@ def display_summary(self):
661
667
print (f"Total tests: { ' ' .join (stats )} " )
662
668
663
669
# Total test files
664
- all_tests = [self .good , self .bad , self .rerun_bad ,
670
+ all_tests = [self .good , self .bad , self .rerun ,
665
671
self .skipped ,
666
672
self .environment_changed , self .run_no_tests ]
667
673
run = sum (map (len , all_tests ))
668
- report = [f'run={ run } ' ]
669
- bad = len (self .bad ) + len (self .rerun_bad )
674
+ text = f'run={ run } '
675
+ if not forever :
676
+ text = f"{ text } /{ len (self .tests )} "
677
+ report = [text ]
678
+ bad = len (self .bad )
670
679
if bad :
671
680
report .append (f'failed={ bad } ' )
672
681
if self .environment_changed :
673
682
report .append (f'env_changed={ len (self .environment_changed )} ' )
674
- skipped = len ( self .skipped )
675
- if skipped :
676
- report . append ( f'skipped= { skipped } ' )
677
- resource_denied = len (self .resource_denied )
678
- if resource_denied :
679
- report .append (f'resource_denied= { resource_denied } ' )
683
+ if self .skipped :
684
+ report . append ( f' skipped= { self . skipped } ' )
685
+ if self . resource_denied :
686
+ report . append ( f'resource_denied= { len (self .resource_denied ) } ' )
687
+ if self . rerun :
688
+ report .append (f'rerun= { len ( self . rerun ) } ' )
680
689
if self .run_no_tests :
681
690
report .append (f'run_no_tests={ len (self .run_no_tests )} ' )
682
691
print (f"Total test files: { ' ' .join (report )} " )
0 commit comments