Skip to content

Commit 0ffb20d

Browse files
committed
Merge bitcoin#34282: qa: Fix Windows logging bug
979d41b qa: Fix Windows logging bug (Hennadii Stepanov) Pull request description: The regex `(.*)` was capturing `\r` from subprocess output on Windows, causing the closing parenthesis in logs to wrap to the next line. For [example](https://github.com/hebasto/bitcoin/actions/runs/20993438084/job/60350204808): ``` 208/454 - feature_bip68_sequence.py passed, Duration: 10 s 209/454 - rpc_bind.py --ipv4 skipped (not on a Linux system ) 210/454 - rpc_bind.py --ipv6 skipped (not on a Linux system ) 211/454 - rpc_packages.py passed, Duration: 8 s 212/454 - rpc_bind.py --nonloopback skipped (not on a Linux system ) 213/454 - p2p_feefilter.py passed, Duration: 4 s ``` Stripping whitespace from the regex match fixes the formatting. [See](https://github.com/hebasto/bitcoin/actions/runs/20993564177/job/60350024373): ``` 208/454 - feature_bip68_sequence.py passed, Duration: 9 s 209/454 - rpc_bind.py --ipv4 skipped (not on a Linux system) 210/454 - rpc_bind.py --ipv6 skipped (not on a Linux system) 211/454 - rpc_bind.py --nonloopback skipped (not on a Linux system) 212/454 - rpc_packages.py passed, Duration: 7 s ``` ACKs for top commit: maflcko: lgtm ACK 979d41b l0rinc: lightly tested ACK 979d41b Tree-SHA512: bafe1937a519e45e4cab395bae622acf65220f313c773a0729ba7dccc3a0a048602f1c04b3e8cdd80d2cf68ae36cef802a819530485d5a745db8abcadf141f68
2 parents 697bc7f + 979d41b commit 0ffb20d

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

test/functional/test_runner.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ def proc_wait(task):
809809
status = "Passed"
810810
elif proc.returncode == TEST_EXIT_SKIPPED:
811811
status = "Skipped"
812-
skip_reason = re.search(r"Test Skipped: (.*)", stdout).group(1)
812+
skip_reason = re.search(r"Test Skipped: (.*)", stdout).group(1).strip()
813813
else:
814814
status = "Failed"
815815

0 commit comments

Comments
 (0)