mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 02:25:40 +01:00
Code Issues Projects Releases Wiki Activity

test: Fix feature_init intermittent issues

Browse Source
This commit is contained in:
MarcoFalke 2022-01-28 13:40:15 +01:00
parent fa4595deb3
commit fa7b07571f
No known key found for this signature in database
GPG Key ID: CE2B75697E69A548
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/functional/feature_init.py
View File

@ -3,8 +3,6 @@
# 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.
"""Stress tests related to node initialization.""" """Stress tests related to node initialization."""
import random
import time
import os import os
from pathlib import Path from pathlib import Path
@ -26,7 +24,6 @@ class InitStressTest(BitcoinTestFramework):
def run_test(self): def run_test(self):
""" """
- test terminating initialization after seeing a certain log line. - test terminating initialization after seeing a certain log line.
- test terminating init after seeing a random number of log lines.
- test removing certain essential files to test startup error paths. - test removing certain essential files to test startup error paths.
""" """
# TODO: skip Windows for now since it isn't clear how to SIGTERM. # TODO: skip Windows for now since it isn't clear how to SIGTERM.
@ -76,10 +73,9 @@ class InitStressTest(BitcoinTestFramework):
for terminate_line in lines_to_terminate_after: for terminate_line in lines_to_terminate_after:
self.log.info(f"Starting node and will exit after line '{terminate_line}'") self.log.info(f"Starting node and will exit after line '{terminate_line}'")
node.start(extra_args=['-txindex=1']) with node.wait_for_debug_log([terminate_line], ignore_case=True):
node.start(extra_args=['-txindex=1'])
num_total_logs = node.wait_for_debug_log([terminate_line], ignore_case=True) self.log.debug("Terminating node after terminate line was found")
self.log.debug(f"Terminating node after {num_total_logs} log lines seen")
sigterm_node() sigterm_node()
check_clean_start() check_clean_start()

9
test/functional/test_framework/test_node.py
View File

@ -422,7 +422,8 @@ class TestNode():
time.sleep(0.05) time.sleep(0.05)
self._raise_assertion_error('Expected messages "{}" does not partially match log:\n\n{}\n\n'.format(str(expected_msgs), print_log)) self._raise_assertion_error('Expected messages "{}" does not partially match log:\n\n{}\n\n'.format(str(expected_msgs), print_log))
def wait_for_debug_log(self, expected_msgs, timeout=10, ignore_case=False) -> int: @contextlib.contextmanager
def wait_for_debug_log(self, expected_msgs, timeout=60, ignore_case=False):
""" """
Block until we see a particular debug log message fragment or until we exceed the timeout. Block until we see a particular debug log message fragment or until we exceed the timeout.
Return: Return:
@ -432,6 +433,8 @@ class TestNode():
prev_size = self.debug_log_bytes() prev_size = self.debug_log_bytes()
re_flags = re.MULTILINE | (re.IGNORECASE if ignore_case else 0) re_flags = re.MULTILINE | (re.IGNORECASE if ignore_case else 0)
yield
while True: while True:
found = True found = True
with open(self.debug_log_path, encoding='utf-8') as dl: with open(self.debug_log_path, encoding='utf-8') as dl:
@ -443,8 +446,7 @@ class TestNode():
found = False found = False
if found: if found:
num_logs = len(log.splitlines()) return
return num_logs
if time.time() >= time_end: if time.time() >= time_end:
print_log = " - " + "\n - ".join(log.splitlines()) print_log = " - " + "\n - ".join(log.splitlines())
@ -456,7 +458,6 @@ class TestNode():
self._raise_assertion_error( self._raise_assertion_error(
'Expected messages "{}" does not partially match log:\n\n{}\n\n'.format( 'Expected messages "{}" does not partially match log:\n\n{}\n\n'.format(
str(expected_msgs), print_log)) str(expected_msgs), print_log))
return -1 # useless return to satisfy linter
@contextlib.contextmanager @contextlib.contextmanager
def profile_with_perf(self, profile_name: str): def profile_with_perf(self, profile_name: str):