diff options
| author | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-27 14:05:16 +0200 |
|---|---|---|
| committer | W. J. van der Laan <laanwj@protonmail.com> | 2021-09-27 14:12:16 +0200 |
| commit | eabc2c482aad6e6f9781211d03720752a5b715be (patch) | |
| tree | 3d7f6fa8a963b5b061df73e5d5412f6ab2af974e | |
| parent | 8b523f2e55713c0093ed46931cb332bfeb1ba661 (diff) | |
| parent | fa01f22e6eb7acdead407c3d263c7e344b4257f4 (diff) | |
Merge bitcoin/bitcoin#23102: test: Add missing re.escape() to feature_addrman test
fa01f22e6eb7acdead407c3d263c7e344b4257f4 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 fa01f22e6eb7acdead407c3d263c7e344b4257f4
hebasto:
ACK fa01f22e6eb7acdead407c3d263c7e344b4257f4, passed 2 consequential runs in my [personal CI](https://cirrus-ci.com/task/6522304080379904).
Tree-SHA512: d7ca4fb882cc6693989ddf6fc092db3259a0619cb8f87293c588484b9c62e6755e9fb1bb2c1ab85fcc8f0349d9bc155ba515e16674c0f6f56236e7fbb14655a8
| -rw-r--r-- | .cirrus.yml | 2 | ||||
| -rwxr-xr-x | test/functional/feature_addrman.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 703d28557e..172e781ec7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -93,7 +93,7 @@ task: QTBASEDIR: 'C:\Qt5.12.11_x64_static_vs2019_160900' x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"' IgnoreWarnIntDirInTempDetected: 'true' - EXCLUDE_TESTS: 'feature_addrman.py,feature_asmap.py' + EXCLUDE_TESTS: 'feature_asmap.py' merge_script: - git config --global user.email "ci@ci.ci" - git config --global user.name "ci" diff --git a/test/functional/feature_addrman.py b/test/functional/feature_addrman.py index 55d3e48c64..5a8394db2e 100755 --- a/test/functional/feature_addrman.py +++ b/test/functional/feature_addrman.py @@ -5,6 +5,7 @@ """Test addrman functionality""" import os +import re import struct from test_framework.messages import ser_uint256, hash256 @@ -56,7 +57,7 @@ class AddrmanTest(BitcoinTestFramework): init_error = lambda reason: ( f"Error: Invalid or corrupt peers.dat \\({reason}\\). If you believe this " f"is a bug, please report it to {self.config['environment']['PACKAGE_BUGREPORT']}. " - f'As a workaround, you can move the file \\("{peers_dat}"\\) out of the way \\(rename, ' + f'As a workaround, you can move the file \\("{re.escape(peers_dat)}"\\) out of the way \\(rename, ' "move, or delete\\) to have a new one created on the next start." ) |