tests: write the notification to different files to avoid race condition
This commit is contained in:
parent
990fc0de1a
commit
67654b6405
2 changed files with 27 additions and 29 deletions
|
@ -55,5 +55,5 @@ test_script:
|
||||||
- ps: src\bench_bitcoin.exe -evals=1 -scaling=0
|
- ps: src\bench_bitcoin.exe -evals=1 -scaling=0
|
||||||
- ps: python test\util\bitcoin-util-test.py
|
- ps: python test\util\bitcoin-util-test.py
|
||||||
- cmd: python test\util\rpcauth-test.py
|
- cmd: python test\util\rpcauth-test.py
|
||||||
- cmd: python test\functional\test_runner.py --force --quiet --combinedlogslen=4000 --exclude "feature_notifications,wallet_multiwallet,wallet_multiwallet.py --usecli"
|
- cmd: python test\functional\test_runner.py --force --quiet --combinedlogslen=4000 --exclude "wallet_multiwallet,wallet_multiwallet.py --usecli"
|
||||||
deploy: off
|
deploy: off
|
||||||
|
|
|
@ -17,17 +17,20 @@ class NotificationsTest(BitcoinTestFramework):
|
||||||
self.skip_if_no_wallet()
|
self.skip_if_no_wallet()
|
||||||
|
|
||||||
def setup_network(self):
|
def setup_network(self):
|
||||||
self.alert_filename = os.path.join(self.options.tmpdir, "alert.txt")
|
self.alertnotify_dir = os.path.join(self.options.tmpdir, "alertnotify")
|
||||||
self.block_filename = os.path.join(self.options.tmpdir, "blocks.txt")
|
self.blocknotify_dir = os.path.join(self.options.tmpdir, "blocknotify")
|
||||||
self.tx_filename = os.path.join(self.options.tmpdir, "transactions.txt")
|
self.walletnotify_dir = os.path.join(self.options.tmpdir, "walletnotify")
|
||||||
|
os.mkdir(self.alertnotify_dir)
|
||||||
|
os.mkdir(self.blocknotify_dir)
|
||||||
|
os.mkdir(self.walletnotify_dir)
|
||||||
|
|
||||||
# -alertnotify and -blocknotify on node0, walletnotify on node1
|
# -alertnotify and -blocknotify on node0, walletnotify on node1
|
||||||
self.extra_args = [["-blockversion=2",
|
self.extra_args = [["-blockversion=2",
|
||||||
"-alertnotify=echo %%s >> %s" % self.alert_filename,
|
"-alertnotify=echo > {}".format(os.path.join(self.alertnotify_dir, '%s')),
|
||||||
"-blocknotify=echo %%s >> %s" % self.block_filename],
|
"-blocknotify=echo > {}".format(os.path.join(self.blocknotify_dir, '%s'))],
|
||||||
["-blockversion=211",
|
["-blockversion=211",
|
||||||
"-rescan",
|
"-rescan",
|
||||||
"-walletnotify=echo %%s >> %s" % self.tx_filename]]
|
"-walletnotify=echo > {}".format(os.path.join(self.walletnotify_dir, '%s'))]]
|
||||||
super().setup_network()
|
super().setup_network()
|
||||||
|
|
||||||
def run_test(self):
|
def run_test(self):
|
||||||
|
@ -35,34 +38,32 @@ class NotificationsTest(BitcoinTestFramework):
|
||||||
block_count = 10
|
block_count = 10
|
||||||
blocks = self.nodes[1].generate(block_count)
|
blocks = self.nodes[1].generate(block_count)
|
||||||
|
|
||||||
# wait at most 10 seconds for expected file size before reading the content
|
# wait at most 10 seconds for expected number of files before reading the content
|
||||||
wait_until(lambda: os.path.isfile(self.block_filename) and os.stat(self.block_filename).st_size >= (block_count * 65), timeout=10)
|
wait_until(lambda: len(os.listdir(self.blocknotify_dir)) == block_count, timeout=10)
|
||||||
|
|
||||||
# file content should equal the generated blocks hashes
|
# directory content should equal the generated blocks hashes
|
||||||
with open(self.block_filename, 'r', encoding="utf-8") as f:
|
assert_equal(sorted(blocks), sorted(os.listdir(self.blocknotify_dir)))
|
||||||
assert_equal(sorted(blocks), sorted(l.strip() for l in f.read().splitlines()))
|
|
||||||
|
|
||||||
self.log.info("test -walletnotify")
|
self.log.info("test -walletnotify")
|
||||||
# wait at most 10 seconds for expected file size before reading the content
|
# wait at most 10 seconds for expected number of files before reading the content
|
||||||
wait_until(lambda: os.path.isfile(self.tx_filename) and os.stat(self.tx_filename).st_size >= (block_count * 65), timeout=10)
|
wait_until(lambda: len(os.listdir(self.walletnotify_dir)) == block_count, timeout=10)
|
||||||
|
|
||||||
# file content should equal the generated transaction hashes
|
# directory content should equal the generated transaction hashes
|
||||||
txids_rpc = list(map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
|
txids_rpc = list(map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
|
||||||
with open(self.tx_filename, 'r', encoding="ascii") as f:
|
assert_equal(sorted(txids_rpc), sorted(os.listdir(self.walletnotify_dir)))
|
||||||
assert_equal(sorted(txids_rpc), sorted(l.strip() for l in f.read().splitlines()))
|
for tx_file in os.listdir(self.walletnotify_dir):
|
||||||
os.remove(self.tx_filename)
|
os.remove(os.path.join(self.walletnotify_dir, tx_file))
|
||||||
|
|
||||||
self.log.info("test -walletnotify after rescan")
|
self.log.info("test -walletnotify after rescan")
|
||||||
# restart node to rescan to force wallet notifications
|
# restart node to rescan to force wallet notifications
|
||||||
self.restart_node(1)
|
self.restart_node(1)
|
||||||
connect_nodes_bi(self.nodes, 0, 1)
|
connect_nodes_bi(self.nodes, 0, 1)
|
||||||
|
|
||||||
wait_until(lambda: os.path.isfile(self.tx_filename) and os.stat(self.tx_filename).st_size >= (block_count * 65), timeout=10)
|
wait_until(lambda: len(os.listdir(self.walletnotify_dir)) == block_count, timeout=10)
|
||||||
|
|
||||||
# file content should equal the generated transaction hashes
|
# directory content should equal the generated transaction hashes
|
||||||
txids_rpc = list(map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
|
txids_rpc = list(map(lambda t: t['txid'], self.nodes[1].listtransactions("*", block_count)))
|
||||||
with open(self.tx_filename, 'r', encoding="ascii") as f:
|
assert_equal(sorted(txids_rpc), sorted(os.listdir(self.walletnotify_dir)))
|
||||||
assert_equal(sorted(txids_rpc), sorted(l.strip() for l in f.read().splitlines()))
|
|
||||||
|
|
||||||
# Mine another 41 up-version blocks. -alertnotify should trigger on the 51st.
|
# Mine another 41 up-version blocks. -alertnotify should trigger on the 51st.
|
||||||
self.log.info("test -alertnotify")
|
self.log.info("test -alertnotify")
|
||||||
|
@ -70,20 +71,17 @@ class NotificationsTest(BitcoinTestFramework):
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
# Give bitcoind 10 seconds to write the alert notification
|
# Give bitcoind 10 seconds to write the alert notification
|
||||||
wait_until(lambda: os.path.isfile(self.alert_filename) and os.path.getsize(self.alert_filename), timeout=10)
|
wait_until(lambda: len(os.listdir(self.alertnotify_dir)), timeout=10)
|
||||||
|
|
||||||
with open(self.alert_filename, 'r', encoding='utf8') as f:
|
for notify_file in os.listdir(self.alertnotify_dir):
|
||||||
alert_text = f.read()
|
os.remove(os.path.join(self.alertnotify_dir, notify_file))
|
||||||
|
|
||||||
# Mine more up-version blocks, should not get more alerts:
|
# Mine more up-version blocks, should not get more alerts:
|
||||||
self.nodes[1].generate(2)
|
self.nodes[1].generate(2)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
with open(self.alert_filename, 'r', encoding='utf8') as f:
|
|
||||||
alert_text2 = f.read()
|
|
||||||
|
|
||||||
self.log.info("-alertnotify should not continue notifying for more unknown version blocks")
|
self.log.info("-alertnotify should not continue notifying for more unknown version blocks")
|
||||||
assert_equal(alert_text, alert_text2)
|
assert_equal(len(os.listdir(self.alertnotify_dir)), 0)
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
NotificationsTest().main()
|
NotificationsTest().main()
|
||||||
|
|
Loading…
Reference in a new issue