diff options
| author | fanquake <fanquake@gmail.com> | 2022-01-20 13:04:39 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-01-20 13:06:04 +0800 |
| commit | a541e5d5198893c3af0d2d1164a15082fb87e006 (patch) | |
| tree | a1bd2d279faae8bd1aa91668f3cbf2fc1128e52b /test | |
| parent | 7102f7d6f3c4a3d08e22ae34a0b3460503a919cf (diff) | |
| parent | dc5d6b0d4793ca978f71f69ef7d6b818794676c2 (diff) | |
| download | bitcoin-a541e5d5198893c3af0d2d1164a15082fb87e006.tar.xz | |
Merge bitcoin/bitcoin#24104: fs: Make compatible with boost 1.78
dc5d6b0d4793ca978f71f69ef7d6b818794676c2 fs: Make compatible with boost 1.78 (Andrew Chow)
Pull request description:
Boost 1.78 removed `operator+` in a way that breaks our usage of it in a subclass. A [proposed workaround](https://github.com/boostorg/filesystem/issues/223#issuecomment-1000230207) for this is to cast the argument to `boost::filesystem::path`, and this is backwards compatible with older versions of boost.
Additionally, it appears that `fs::canonical` no longer removes trailing slashes. This was causing a test to fail. The solution is to explicitly remove the trailing separator in the one place that `fs::canonical` is used.
Lastly, `fs::create_directories` now has an error message saying `create_directories` instead of `create_directory`. This caused wallet_multiwallet.py to fail. The error message check has been updated to be able accept either string.
Fixes #23846
ACKs for top commit:
ryanofsky:
Code review ACK dc5d6b0d4793ca978f71f69ef7d6b818794676c2
vincenzopalazzo:
ACK https://github.com/bitcoin/bitcoin/pull/24104/commits/dc5d6b0d4793ca978f71f69ef7d6b818794676c2
Tree-SHA512: d4d8e7b49b8dfbf0ced9bfe9a2b3827841227fc755fc799f19159076b0ccf882432cc8b6ad93cdeda98fb58b942b9ba50a9e0a6b4f6b1e0097e80f1074ae5682
Diffstat (limited to 'test')
| -rwxr-xr-x | test/functional/wallet_multiwallet.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/functional/wallet_multiwallet.py b/test/functional/wallet_multiwallet.py index 0b868dde6c..317121eb68 100755 --- a/test/functional/wallet_multiwallet.py +++ b/test/functional/wallet_multiwallet.py @@ -141,7 +141,7 @@ class MultiWalletTest(BitcoinTestFramework): # should raise rpc error if wallet path can't be created err_code = -4 if self.options.descriptors else -1 - assert_raises_rpc_error(err_code, "boost::filesystem::create_directory:", self.nodes[0].createwallet, "w8/bad") + assert_raises_rpc_error(err_code, "boost::filesystem::create_director", self.nodes[0].createwallet, "w8/bad") # check that all requested wallets were created self.stop_node(0) |