highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-06-01 16:53:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

qa: Only complain about expected messages that were not found

Browse Source 
Only leaves messages we never found in the final assert message of the functions, which is more helpful (remaining_expected).

Avoids repeatedly searching for messages we have already found (pop()).

Stops searching for other expected messages if we already failed finding one. Still need to clean remaining_expected at the end, but *only if we fail*.

Co-authored-by: Lőrinc <pap.lorinc@gmail.com>
This commit is contained in:
Hodlinator
2025-09-25 23:12:01 +02:00
parent 1e54125e2e
commit a1f7623020
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -546,6 +546,7 @@ class TestNode():
unexpected_msgs = []
assert_equal(type(expected_msgs), list)
assert_equal(type(unexpected_msgs), list)
remaining_expected = list(expected_msgs)
time_end = time.time() + timeout * self.timeout_factor
prev_size = self.debug_log_size(encoding="utf-8") # Must use same encoding that is used to read() below
@@ -556,7 +557,6 @@ class TestNode():
yield
while True:
found = True
with open(self.debug_log_path, encoding="utf-8", errors="replace") as dl:
dl.seek(prev_size)
log = dl.read()
@@ -564,15 +564,15 @@ class TestNode():
if unexpected_msg in log:
self._raise_assertion_error(f'Unexpected message "{unexpected_msg}" '
f'found in log:\n\n{join_log(log)}\n\n')
for expected_msg in expected_msgs:
if expected_msg not in log:
found = False
if found:
while remaining_expected and remaining_expected[-1] in log:
remaining_expected.pop()
if not remaining_expected:
return
if time.time() >= time_end:
break
time.sleep(0.05)
self._raise_assertion_error(f'Expected message(s) {expected_msgs!s} '
remaining_expected = [e for e in remaining_expected if e not in log]
self._raise_assertion_error(f'Expected message(s) {remaining_expected!s} '
f'not found in log:\n\n{join_log(log)}\n\n')
@contextlib.contextmanager
@@ -582,20 +582,18 @@ class TestNode():
"""
time_end = time.time() + timeout * self.timeout_factor
prev_size = self.debug_log_size(mode="rb") # Must use same mode that is used to read() below
remaining_expected = list(expected_msgs)
yield
while True:
found = True
with open(self.debug_log_path, "rb") as dl:
dl.seek(prev_size)
log = dl.read()
for expected_msg in expected_msgs:
if expected_msg not in log:
found = False
if found:
while remaining_expected and remaining_expected[-1] in log:
remaining_expected.pop()
if not remaining_expected:
return
if time.time() >= time_end:
@@ -605,7 +603,8 @@ class TestNode():
# No sleep here because we want to detect the message fragment as fast as
# possible.
self._raise_assertion_error(f'Expected message(s) {expected_msgs!s} '
remaining_expected = [e for e in remaining_expected if e not in log]
self._raise_assertion_error(f'Expected message(s) {remaining_expected!s} '
f'not found in log:\n\n{print_log}\n\n')
@contextlib.contextmanager