GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 9dbcd37105 into merged_master (Bitcoin PR #20569)

Browse source
This commit is contained in:
Andrew Poelstra 2021-06-14 18:06:07 +00:00
commit 7744178267
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/functional/wallet_multiwallet.py
View file

@ -23,9 +23,11 @@ from test_framework.util import (
)
got_loading_error = False
def test_load_unload(node, name):
global got_loading_error
for _ in range(10):
while True:
if got_loading_error:
return
try:
@ -68,7 +70,7 @@ class MultiWalletTest(BitcoinTestFramework):
return wallet_dir(name, "wallet.dat")
return wallet_dir(name)
assert_equal(self.nodes[0].listwalletdir(), { 'wallets': [{ 'name': self.default_wallet_name }] })
assert_equal(self.nodes[0].listwalletdir(), {'wallets': [{'name': self.default_wallet_name}]})
# check wallet.dat is created
self.stop_nodes()
@ -278,7 +280,7 @@ class MultiWalletTest(BitcoinTestFramework):
threads = []
for _ in range(3):
n = node.cli if self.options.usecli else get_rpc_proxy(node.url, 1, timeout=600, coveragedir=node.coverage_dir)
t = Thread(target=test_load_unload, args=(n, wallet_names[2], ))
t = Thread(target=test_load_unload, args=(n, wallet_names[2]))
t.start()
threads.append(t)
for t in threads: