Uses new AsyncMock

Author: pcrespov

services/sidecar/src/simcore_service_sidecar/log_parser.py

@@ -124,5 +124,4 @@ async def _monitor_log_file(
                 await asyncio.sleep(1)
                 continue
             log_type, parsed_line = await parse_line(line)
-
             await log_cb(log_type, parsed_line)

services/sidecar/tests/unit/test_celery_configurator.py

@@ -1,5 +1,4 @@
 # pylint: disable=unused-argument,redefined-outer-name,no-member
-import asyncio
 from pathlib import Path
 
 import aiodocker
@@ -12,15 +11,13 @@
 
 
 def _toggle_gpu_mock(mocker, has_gpu: bool) -> None:
-    containers_get = mocker.patch(
-        "aiodocker.containers.DockerContainers.run", return_value=asyncio.Future()
-    )
-
     class FakeContainer:
         async def wait(self, **kwargs):
             return {"StatusCode": 0 if has_gpu else 127}
 
-    containers_get.return_value.set_result(FakeContainer())
+    containers_get = mocker.patch(
+        "aiodocker.containers.DockerContainers.run", return_value=FakeContainer()
+    )
 
     if not has_gpu:
         containers_get.side_effect = aiodocker.exceptions.DockerError(
@@ -95,7 +92,7 @@ def test_force_start_gpu_mode(mocker, force_gpu_mode, gpu_support) -> None:
     mocked_configure_gpu_mode.assert_called_with(BootMode.GPU)
 
 
-def test_auto_detects_gpu(mocker, mock_node_with_gpu) -> None:
+def test_auto_detects_gpu(mocker, mock_node_with_gpu, loop) -> None:
     mocked_configure_gpu_mode = mocker.patch(
         "simcore_service_sidecar.celery_configurator.configure_node"
     )

services/sidecar/tests/unit/test_log_parser.py

@@ -1,4 +1,4 @@
-from asyncio import Future, ensure_future, sleep
+import asyncio
 from pathlib import Path
 
 import pytest
@@ -42,21 +42,20 @@ async def test_parse_line(log, expected_log_type, expected_parsed_message):
     assert log_message == expected_parsed_message
 
 
-def future_with_result(result):
-    f = Future()
-    f.set_result(result)
-    return f
-
-
 async def test_monitor_log_task(temp_folder: Path, mocker):
-    mock_cb = mocker.Mock(return_value=future_with_result(""))
+    mock_awaitable_callback = mocker.AsyncMock(return_value="")
     log_file = temp_folder / "test_log.txt"
     log_file.touch()
     assert log_file.exists()
-    task = ensure_future(monitor_logs_task(log_file, mock_cb))
+
+    task = asyncio.create_task(monitor_logs_task(log_file, mock_awaitable_callback))
     assert task
-    await sleep(2)
+
+    await asyncio.sleep(2)
     log_file.write_text("this is a test")
-    await sleep(2)
-    mock_cb.assert_called_once()
+
+    await asyncio.sleep(2)
+    mock_awaitable_callback.assert_called_once()
+    mock_awaitable_callback.assert_awaited()
+
     assert task.cancel()