diff --git a/src/tests/test_loguru.py b/src/tests/test_loguru.py index 346e7a131..5de8309a4 100644 --- a/src/tests/test_loguru.py +++ b/src/tests/test_loguru.py @@ -7,6 +7,7 @@ from hypothesis import given from loguru import logger +from loguru._defaults import LOGURU_FORMAT from loguru._recattrs import RecordFile, RecordLevel, RecordProcess, RecordThread from pytest import CaptureFixture, mark, param, raises @@ -37,7 +38,7 @@ make_slack_sink, make_slack_sink_async, ) -from utilities.text import strip_and_dedent +from utilities.text import ensure_str, strip_and_dedent if TYPE_CHECKING: from collections.abc import Callable @@ -222,15 +223,23 @@ def test_exit_explicit(self, *, capsys: CaptureFixture) -> None: assert search(expected2, line2), line2 def test_exit_duration(self, *, capsys: CaptureFixture) -> None: - handler: HandlerConfiguration = {"sink": sys.stdout, "level": LogLevel.TRACE} + default_format = ensure_str(LOGURU_FORMAT) + handler: HandlerConfiguration = { + "sink": sys.stdout, + "level": LogLevel.TRACE, + "format": f"{default_format} | {{extra}}", + } _ = logger.configure(handlers=[cast(dict[str, Any], handler)]) assert func_test_log_exit_duration(1) == 2 out = capsys.readouterr().out line1, line2 = out.splitlines() - expected1 = self.trace + r"func_test_log_exit_duration:\d+ - ➢$" + expected1 = self.trace + r"func_test_log_exit_duration:\d+ - ➢ | {}$" assert search(expected1, line1), line1 - expected2 = self.trace + r"func_test_log_exit_duration:\d+ - ✔$" + expected2 = ( + self.trace + + r"func_test_log_exit_duration:\d+ - ✔ | {'⏲': \d:\d{2}:\d{2}\.\d{6}}$" + ) assert search(expected2, line2), line2 diff --git a/src/tests/test_loguru_functions.py b/src/tests/test_loguru_functions.py index 978c2ee25..69e3d8e05 100644 --- a/src/tests/test_loguru_functions.py +++ b/src/tests/test_loguru_functions.py @@ -57,8 +57,8 @@ def func_test_log_exit_explicit(x: int, /) -> int: def func_test_log_exit_duration(x: int, /) -> int: - with log(exit_duration=0.01): - sleep(0.02) + with log(exit_duration=0.0): + sleep(0.01) return x + 1 diff --git a/src/utilities/__init__.py b/src/utilities/__init__.py index 1cdad2321..7b584a8b2 100644 --- a/src/utilities/__init__.py +++ b/src/utilities/__init__.py @@ -1,3 +1,3 @@ from __future__ import annotations -__version__ = "0.55.2" +__version__ = "0.55.3" diff --git a/src/utilities/loguru.py b/src/utilities/loguru.py index d8c629647..e943005a6 100644 --- a/src/utilities/loguru.py +++ b/src/utilities/loguru.py @@ -230,7 +230,7 @@ def log( assert_never(never) logger_exit = logger if exit_bind is None else logger.bind(**exit_bind) logger_exit.opt(depth=depth).log( - exit_level_use, exit_message, timer=timer + exit_level_use, exit_message, **{"⏲": timer} )