diff --git a/dispatcher.py b/dispatcher.py index e463beaf..e60983f6 100644 --- a/dispatcher.py +++ b/dispatcher.py @@ -237,14 +237,15 @@ def report_undone(self, verbose): return False if verbose: color_stdout( - 'The following tasks were dispatched on some worker task ' + '[Internal test-run error] ' + 'The following tasks were dispatched to some worker task ' 'queue, but were not reported as done (does not matters ' 'success or fail):\n', schema='test_var') for task_id in undone: color_stdout('- %s' % yaml.safe_dump(task_id)) else: - color_stdout("Count of didn't processed tasks: %d\n" - % len(undone), schema='test_var') + # Visually continue StatisticsWatcher.print_statistics() output. + color_stdout('* undone: %d\n' % len(undone), schema='test_var') return True def wait(self): diff --git a/test-run.py b/test-run.py index 3ee3beca..1e2f17ea 100755 --- a/test-run.py +++ b/test-run.py @@ -107,20 +107,20 @@ def main_loop_parallel(): dispatcher.wait_processes() color_stdout('-' * 81, "\n", schema='separator') has_failed = dispatcher.statistics.print_statistics() - has_undone = dispatcher.report_undone(verbose=is_force) + has_undone = dispatcher.report_undone(verbose=True) if has_failed: return EXIT_FAILED_TEST - if is_force and has_undone: + if has_undone: return EXIT_NOTDONE_TEST except KeyboardInterrupt: color_stdout('-' * 81, "\n", schema='separator') dispatcher.statistics.print_statistics() - dispatcher.report_undone(verbose=is_force) + dispatcher.report_undone(verbose=False) raise except HangError: color_stdout('-' * 81, "\n", schema='separator') dispatcher.statistics.print_statistics() - dispatcher.report_undone(verbose=is_force) + dispatcher.report_undone(verbose=True) return EXIT_HANG return EXIT_SUCCESS