ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Refactor string matching loop for readability

Browse Source 
(cherry picked from commit 831c5d34f9)
This commit is contained in:
Michał Kępień
2023-12-21 12:22:18 +01:00
committed by Michal Nowak
parent f45e777b9f
commit 93b4b110a7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/tests/system/checkds/tests_checkds.py
View File

@@ -356,12 +356,15 @@ def test_checkds(servers, params):
# Wait until the provided zone is signed and then verify its DNSSEC data.
zone_check(servers["ns9"], params.zone)
# Wait until all the expected log lines are found in the log file for the
# provided server.
# Wait up to 10 seconds until all the expected log lines are found in the
# log file for the provided server.
time_remaining = 10
for log_string in params.logs_to_wait_for:
with servers["ns9"].watch_log_from_start() as watcher:
line = f"zone {params.zone}/IN (signed): checkds: {log_string}"
watcher.wait_for_line(line)
line = f"zone {params.zone}/IN (signed): checkds: {log_string}"
while line not in servers["ns9"].log:
time_remaining -= 1
assert time_remaining, f'Timed out waiting for "{log_string}" to be logged'
time.sleep(1)
# Check whether key states on the parent server provided match
# expectations.