From 7ad9d508a177b02ce6f337578b62b28662189cc0 Mon Sep 17 00:00:00 2001 From: Pavel Kirienko Date: Thu, 18 Jan 2024 21:00:51 +0200 Subject: [PATCH] Enlarge timeouts in the monitor test --- tests/cmd/monitor.py | 9 +++++---- yakut/__init__.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tests/cmd/monitor.py b/tests/cmd/monitor.py index 2c111c8..29314b3 100755 --- a/tests/cmd/monitor.py +++ b/tests/cmd/monitor.py @@ -26,10 +26,11 @@ async def _unittest_monitor_nodes(compiled_dsdl: Any) -> None: _ = compiled_dsdl asyncio.get_running_loop().slow_callback_duration = 10.0 + asyncio.get_running_loop().set_exception_handler(lambda *_: None) task = asyncio.create_task(_run_nodes()) try: - cells = [x.split() for x in (await _monitor_and_get_last_screen(10.0, 42)).splitlines()] + cells = [x.split() for x in (await _monitor_and_get_last_screen(30.0, 42)).splitlines()] finally: task.cancel() await asyncio.sleep(3.0) @@ -74,7 +75,7 @@ async def _unittest_monitor_nodes(compiled_dsdl: Any) -> None: asyncio.create_task(_delay(_run_nodes(), 1.0, duration=5.0)), asyncio.create_task(_delay(_run_anonymous(), 1.0, duration=5.0)), ] - cells = [x.split() for x in (await _monitor_and_get_last_screen(20.0, 42)).splitlines()] + cells = [x.split() for x in (await _monitor_and_get_last_screen(30.0, 42)).splitlines()] await asyncio.gather(*tasks) await asyncio.sleep(3.0) @@ -121,7 +122,7 @@ async def _unittest_monitor_errors(compiled_dsdl: Any) -> None: _run_zombie(), _delay(_inject_error(), 7.0), ) - cells = [x.split() for x in (await _monitor_and_get_last_screen(12.0, None)).splitlines()] + cells = [x.split() for x in (await _monitor_and_get_last_screen(30.0, None)).splitlines()] task.cancel() await asyncio.sleep(3.0) @@ -170,7 +171,7 @@ async def _monitor_and_get_last_screen(duration: float, node_id: Optional[int]) assert " CRI" not in stderr assert "Traceback" not in stderr - screens = stdout.split("\n" * 3) + screens = stdout.replace("\r", "").split("\n" * 3) assert len(screens) >= 1 assert len(screens) < (duration * 0.5 + 10) last_screen = screens[-1] diff --git a/yakut/__init__.py b/yakut/__init__.py index 658489c..1e6696c 100644 --- a/yakut/__init__.py +++ b/yakut/__init__.py @@ -2,7 +2,7 @@ # This software is distributed under the terms of the MIT License. # Author: Pavel Kirienko -# Disabling unused ignores because we need to support differnt versions of importlib.resources. +# Disabling unused ignores because we need to support different versions of importlib.resources. # mypy: warn_unused_ignores=False # pylint: disable=wrong-import-position