Skip to content

Commit 013924a

Browse files
author
MacroFake
committed
Merge bitcoin/bitcoin#26031: test: Display skipped tests reason
07b6e74 test: Display skipped tests reason (Aurèle Oulès) Pull request description: Attempt to fix #26023. ACKs for top commit: brunoerg: ACK 07b6e74 Tree-SHA512: 5d8f7fbd8d65772000a5da8c01276948b157d93d359203c6442cf2681cdcc2426b1fee7ec62cee100019c59a486a96ad98d5e819bffe1fd37624dcd28f42aed2
2 parents a9049dd + 07b6e74 commit 013924a

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

test/functional/test_runner.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -555,14 +555,14 @@ def run_tests(*, test_list, src_dir, build_dir, tmpdir, jobs=1, enable_coverage=
555555
while i < test_count:
556556
if failfast and not all_passed:
557557
break
558-
for test_result, testdir, stdout, stderr in job_queue.get_next():
558+
for test_result, testdir, stdout, stderr, skip_reason in job_queue.get_next():
559559
test_results.append(test_result)
560560
i += 1
561561
done_str = "{}/{} - {}{}{}".format(i, test_count, BOLD[1], test_result.name, BOLD[0])
562562
if test_result.status == "Passed":
563563
logging.debug("%s passed, Duration: %s s" % (done_str, test_result.time))
564564
elif test_result.status == "Skipped":
565-
logging.debug("%s skipped" % (done_str))
565+
logging.debug(f"{done_str} skipped ({skip_reason})")
566566
else:
567567
all_passed = False
568568
print("%s failed, Duration: %s s\n" % (done_str, test_result.time))
@@ -686,10 +686,12 @@ def get_next(self):
686686
log_out.seek(0), log_err.seek(0)
687687
[stdout, stderr] = [log_file.read().decode('utf-8') for log_file in (log_out, log_err)]
688688
log_out.close(), log_err.close()
689+
skip_reason = None
689690
if proc.returncode == TEST_EXIT_PASSED and stderr == "":
690691
status = "Passed"
691692
elif proc.returncode == TEST_EXIT_SKIPPED:
692693
status = "Skipped"
694+
skip_reason = re.search(r"Test Skipped: (.*)", stdout).group(1)
693695
else:
694696
status = "Failed"
695697
self.num_running -= 1
@@ -698,7 +700,7 @@ def get_next(self):
698700
clearline = '\r' + (' ' * dot_count) + '\r'
699701
print(clearline, end='', flush=True)
700702
dot_count = 0
701-
ret.append((TestResult(name, status, int(time.time() - start_time)), testdir, stdout, stderr))
703+
ret.append((TestResult(name, status, int(time.time() - start_time)), testdir, stdout, stderr, skip_reason))
702704
if ret:
703705
return ret
704706
if self.use_term_control:

0 commit comments

Comments
 (0)