Merge 683dda2a70 into merged_master (Bitcoin PR bitcoin/bitcoin#21777)

This commit is contained in:
Andrew Poelstra 2021-07-01 03:35:37 +00:00
commit e8fbb8c8bd

View file

@ -166,6 +166,8 @@ class NotificationsTest(BitcoinTestFramework):
# Should now verify contents of each file
for tx_id, blockheight, blockhash in tx_details:
fname = os.path.join(self.walletnotify_dir, notify_outputname(self.wallet, tx_id))
# Wait for the cached writes to hit storage
self.wait_until(lambda: os.path.getsize(fname) > 0, timeout=10)
with open(fname, 'rt', encoding='utf-8') as f:
text = f.read()
# Universal newline ensures '\n' on 'nt'