From 944863c2f7f62ecac598eaff78735e37c111c631 Mon Sep 17 00:00:00 2001 From: Colin Vidal Date: Wed, 11 Jun 2025 15:45:52 +0200 Subject: [PATCH] fix watchlog.py doctest Fix some broken doctest in watchlog.py (no semantic error, but API slightly changed and broke some output messags). Also add a test for a missing failure case. (cherry picked from commit 9778068253e9147f7b33d47c7f0ef221cee6b9f9) --- bin/tests/system/isctest/log/watchlog.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/isctest/log/watchlog.py b/bin/tests/system/isctest/log/watchlog.py index ffa75e156d..3d35df09e9 100644 --- a/bin/tests/system/isctest/log/watchlog.py +++ b/bin/tests/system/isctest/log/watchlog.py @@ -76,20 +76,26 @@ class WatchLog(abc.ABC): ... print("Just print something without waiting for a log line") Traceback (most recent call last): ... - Exception: wait_for_*() was not called + isctest.log.watchlog.WatchLogException: wait_for_*() was not called >>> with WatchLogFromHere("/dev/null") as watcher: ... try: - ... watcher.wait_for_line("foo", timeout=0) + ... watcher.wait_for_line("foo", timeout=0.1) ... except TimeoutError: ... pass ... try: - ... watcher.wait_for_lines({"bar": 42}, timeout=0) + ... watcher.wait_for_lines({"bar": 42}, timeout=0.1) ... except TimeoutError: ... pass Traceback (most recent call last): ... - Exception: wait_for_*() was already called + isctest.log.watchlog.WatchLogException: wait_for_*() was already called + + >>> with WatchLogFromHere("/dev/null") as watcher: + ... watcher.wait_for_line("foo", timeout=0) + Traceback (most recent call last): + ... + AssertionError: Do not use this class unless you want to WAIT for something. """ self._fd = None # type: Optional[TextIO] self._path = path