fixed tests

Author: sanderegg

packages/pytest-simcore/src/pytest_simcore/docker_swarm.py

@@ -15,6 +15,7 @@
 import aiodocker
 import docker
 import pytest
+import pytest_asyncio
 import yaml
 from common_library.dict_tools import copy_from_dict
 from docker.errors import APIError
@@ -245,7 +246,7 @@ def _make_dask_sidecar_certificates(simcore_service_folder: Path) -> None:
     )
 
 
-@pytest.fixture(scope="module")
+@pytest_asyncio.fixture(scope="module", loop_scope="module")
 async def docker_stack(
     osparc_simcore_services_dir: Path,
     docker_swarm: None,

services/web/server/tests/integration/conftest.py

@@ -13,6 +13,7 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
+import asyncio
 import json
 import logging
 import sys
@@ -178,3 +179,11 @@ def mock_orphaned_services(mocker: MockerFixture) -> mock.Mock:
 @pytest.fixture(scope="session")
 def osparc_product_name() -> str:
     return "osparc"
+
+
+@pytest.fixture
+async def loop(
+    event_loop: asyncio.AbstractEventLoop,
+) -> asyncio.AbstractEventLoop:
+    """Override the event loop inside pytest-aiohttp with the one from pytest-asyncio."""
+    return event_loop