Auto merge of #2897 - str4d:2892-zkey-rpc-bugfix, r=str4d
zkey_import_export: Synchronize mempools before mining Resolves a race condition that caused the RPC test to intermittently fail. Closes #2892.
This commit is contained in:
commit
b4a20ae5ac
|
@ -113,7 +113,8 @@ class ZkeyImportExportTest (BitcoinTestFramework):
|
||||||
alice_zaddr = alice.z_getnewaddress()
|
alice_zaddr = alice.z_getnewaddress()
|
||||||
res = alice.z_shieldcoinbase("*", alice_zaddr)
|
res = alice.z_shieldcoinbase("*", alice_zaddr)
|
||||||
self.wait_and_assert_operationid_status(alice, res['opid'])
|
self.wait_and_assert_operationid_status(alice, res['opid'])
|
||||||
miner.generate(6)
|
self.sync_all()
|
||||||
|
miner.generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
# Now get a pristine z-address for receiving transfers:
|
# Now get a pristine z-address for receiving transfers:
|
||||||
|
|
Loading…
Reference in New Issue