Make forknotify.py more robust
forknotify would intermittently fail because the alert file was not being written fast enough. This commit adds a timeout so the test does not fail immediately.
This commit is contained in:
parent
1f3d78b4e0
commit
a4fd89fddb
1 changed files with 12 additions and 3 deletions
|
@ -3,6 +3,8 @@
|
||||||
# Distributed under the MIT software license, see the accompanying
|
# Distributed under the MIT software license, see the accompanying
|
||||||
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
"""Test the -alertnotify option."""
|
"""Test the -alertnotify option."""
|
||||||
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
from test_framework.test_framework import BitcoinTestFramework
|
from test_framework.test_framework import BitcoinTestFramework
|
||||||
from test_framework.util import *
|
from test_framework.util import *
|
||||||
|
@ -41,12 +43,19 @@ class ForkNotifyTest(BitcoinTestFramework):
|
||||||
self.nodes[1].generate(1)
|
self.nodes[1].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
||||||
|
# Give bitcoind 10 seconds to write the alert notification
|
||||||
|
timeout = 10.0
|
||||||
|
while timeout > 0:
|
||||||
|
if os.path.exists(self.alert_filename) and os.path.getsize(self.alert_filename):
|
||||||
|
break
|
||||||
|
time.sleep(0.1)
|
||||||
|
timeout -= 0.1
|
||||||
|
else:
|
||||||
|
assert False, "-alertnotify did not warn of up-version blocks"
|
||||||
|
|
||||||
with open(self.alert_filename, 'r', encoding='utf8') as f:
|
with open(self.alert_filename, 'r', encoding='utf8') as f:
|
||||||
alert_text = f.read()
|
alert_text = f.read()
|
||||||
|
|
||||||
if len(alert_text) == 0:
|
|
||||||
raise AssertionError("-alertnotify did not warn of up-version blocks")
|
|
||||||
|
|
||||||
# Mine more up-version blocks, should not get more alerts:
|
# Mine more up-version blocks, should not get more alerts:
|
||||||
self.nodes[1].generate(1)
|
self.nodes[1].generate(1)
|
||||||
self.sync_all()
|
self.sync_all()
|
||||||
|
|
Loading…
Reference in a new issue