Skip to content

Commit eabc2c4

Browse files
committed
Merge bitcoin/bitcoin#23102: test: Add missing re.escape() to feature_addrman test
fa01f22 test: Add missing re.escape() to feature_addrman test (MarcoFalke) Pull request description: Needed to run the test on windows ACKs for top commit: laanwj: Code review ACK fa01f22 hebasto: ACK fa01f22, passed 2 consequential runs in my [personal CI](https://cirrus-ci.com/task/6522304080379904). Tree-SHA512: d7ca4fb882cc6693989ddf6fc092db3259a0619cb8f87293c588484b9c62e6755e9fb1bb2c1ab85fcc8f0349d9bc155ba515e16674c0f6f56236e7fbb14655a8
2 parents 8b523f2 + fa01f22 commit eabc2c4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

.cirrus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ task:
9393
QTBASEDIR: 'C:\Qt5.12.11_x64_static_vs2019_160900'
9494
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
9595
IgnoreWarnIntDirInTempDetected: 'true'
96-
EXCLUDE_TESTS: 'feature_addrman.py,feature_asmap.py'
96+
EXCLUDE_TESTS: 'feature_asmap.py'
9797
merge_script:
9898
- git config --global user.email "[email protected]"
9999
- git config --global user.name "ci"

test/functional/feature_addrman.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"""Test addrman functionality"""
66

77
import os
8+
import re
89
import struct
910

1011
from test_framework.messages import ser_uint256, hash256
@@ -56,7 +57,7 @@ def run_test(self):
5657
init_error = lambda reason: (
5758
f"Error: Invalid or corrupt peers.dat \\({reason}\\). If you believe this "
5859
f"is a bug, please report it to {self.config['environment']['PACKAGE_BUGREPORT']}. "
59-
f'As a workaround, you can move the file \\("{peers_dat}"\\) out of the way \\(rename, '
60+
f'As a workaround, you can move the file \\("{re.escape(peers_dat)}"\\) out of the way \\(rename, '
6061
"move, or delete\\) to have a new one created on the next start."
6162
)
6263

0 commit comments

Comments
 (0)