From: Christian Heller Date: Tue, 28 Oct 2025 18:19:06 +0000 (+0100) Subject: In testing, for log command comparisons ignore formatting instructions. X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/template?a=commitdiff_plain;h=511276a11440c922efa944b0509b403e50cfe88f;p=ircplom In testing, for log command comparisons ignore formatting instructions. --- diff --git a/src/ircplom/testing.py b/src/ircplom/testing.py index b999bda..cafc95f 100644 --- a/src/ircplom/testing.py +++ b/src/ircplom/testing.py @@ -8,7 +8,7 @@ from ircplom.events import Event, Loop, QueueMixin from ircplom.client import IrcConnection, IrcConnSetup from ircplom.client_tui import ClientKnowingTui, ClientTui, LOG_PREFIX_IN from ircplom.irc_conn import ERR_STR_TIMEOUT, IrcConnException, IrcMessage -from ircplom.tui_base import (TerminalInterface, TuiEvent, +from ircplom.tui_base import (FormattingString, TerminalInterface, TuiEvent, LOG_FMT_SEP, LOG_FMT_ATTRS) @@ -438,8 +438,9 @@ class TestingClientTui(ClientTui): def log(self, msg: str, escape=True, **kwargs) -> None: def test_after(cmd_name: str, args: tuple[str, ...], ret) -> None: assert cmd_name == _MARK_LOG, f'WANTED {_MARK_LOG}, GOT {cmd_name}' - win_ids, logged_msg = ret - fmt, time_str, msg_sans_time = logged_msg.split(' ', maxsplit=2) + win_ids, logged = ret + fmt, time_str, msg_sans_time\ + = FormattingString(logged).stripped().split(' ', maxsplit=2) msg_sans_time = fmt + ' ' + msg_sans_time assert len(time_str) == 8 for c in time_str[:2] + time_str[3:5] + time_str[6:]: