♻️ Fixes flaky test_update_profile and cleanup tests (#3528)

packages/postgres-database/tests/test_services_consume_filetypes.py

@@ -6,7 +6,6 @@
 
 import pytest
 import sqlalchemy as sa
-from _pytest.fixtures import fixture
 from aiopg.sa.engine import Engine
 from aiopg.sa.exc import ResourceClosedError
 from aiopg.sa.result import ResultProxy, RowProxy
@@ -57,7 +56,7 @@ async def _make(conn):
     return _make
 
 
-@fixture
+@pytest.fixture
 async def conn(pg_engine: Engine, make_table):
     async with pg_engine.acquire() as conn:
         await make_table(conn)

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

@@ -20,9 +20,8 @@
 
 import pytest
 import yaml
-from _pytest.config import ExitCode
-from _pytest.monkeypatch import MonkeyPatch
 from dotenv import dotenv_values, set_key
+from pytest import ExitCode, MonkeyPatch
 
 from .helpers import (
     FIXTURE_CONFIG_CORE_SERVICES_SELECTION,

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

@@ -8,7 +8,7 @@
 
 import dotenv
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 
 
 @pytest.fixture(scope="session")

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

@@ -6,11 +6,11 @@
 from typing import Any, Iterator
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
 from minio import Minio
 from minio.datatypes import Object
 from minio.deleteobjects import DeleteError, DeleteObject
 from pydantic import parse_obj_as
+from pytest import MonkeyPatch
 from tenacity import Retrying
 from tenacity.before_sleep import before_sleep_log
 from tenacity.stop import stop_after_attempt

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

@@ -6,8 +6,7 @@
 from typing import Iterator
 
 import pytest
-from _pytest.fixtures import FixtureRequest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import FixtureRequest, MonkeyPatch
 
 warnings.warn(
     f"{__name__} is deprecated, we highly recommend to use pytest.monkeypatch at function-scope level."

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

@@ -9,8 +9,8 @@
 
 import aiohttp
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
 from aiohttp.client import ClientTimeout
+from pytest import MonkeyPatch
 from tenacity._asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
 from tenacity.stop import stop_after_delay

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

@@ -12,8 +12,7 @@
 from pathlib import Path
 
 import pytest
-from _pytest.fixtures import FixtureRequest
-from _pytest.tmpdir import TempPathFactory
+from pytest import FixtureRequest, TempPathFactory
 
 
 @pytest.fixture(scope="module")

packages/settings-library/tests/test_docker_registry.py

@@ -4,7 +4,7 @@
 from copy import deepcopy
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from settings_library.docker_registry import RegistrySettings
 
 MOCKED_BASE_REGISTRY_ENV_VARS: dict[str, str] = {

packages/simcore-sdk/tests/integration/test_node_ports_common_r_clone.py

@@ -12,10 +12,10 @@
 
 import aioboto3
 import pytest
-from _pytest.fixtures import FixtureRequest
 from faker import Faker
 from models_library.api_schemas_storage import FileUploadLinks, FileUploadSchema
 from pydantic import AnyUrl, ByteSize, parse_obj_as
+from pytest import FixtureRequest
 from settings_library.r_clone import RCloneSettings
 from simcore_sdk.node_ports_common import r_clone
 

services/agent/tests/conftest.py

@@ -9,12 +9,11 @@
 import aiodocker
 import pytest
 import simcore_service_agent
-from _pytest.logging import LogCaptureFixture
 from aiodocker.volumes import DockerVolume
 from models_library.basic_types import BootModeEnum
 from moto.server import ThreadedMotoServer
 from pydantic import HttpUrl, parse_obj_as
-from pytest import MonkeyPatch
+from pytest import LogCaptureFixture, MonkeyPatch
 from pytest_simcore.helpers.utils_docker import get_localhost_ip
 from settings_library.r_clone import S3Provider
 from simcore_service_agent.core.settings import ApplicationSettings

services/agent/tests/unit/test_modules_volumes_cleanup.py

@@ -5,8 +5,8 @@
 from pathlib import Path
 
 import pytest
-from _pytest.logging import LogCaptureFixture
 from aiodocker.volumes import DockerVolume
+from pytest import LogCaptureFixture
 from pytest_mock.plugin import MockerFixture
 from simcore_service_agent.core.settings import ApplicationSettings
 from simcore_service_agent.modules.volumes_cleanup import backup_and_remove_volumes

services/catalog/tests/unit/test_services_director.py

@@ -5,13 +5,13 @@
 # pylint:disable=not-context-manager
 
 
-from typing import Dict, Iterator
+from typing import Iterator
 
 import pytest
 import respx
-from _pytest.monkeypatch import MonkeyPatch
 from fastapi import FastAPI
 from fastapi.testclient import TestClient
+from pytest import MonkeyPatch
 from respx.router import MockRouter
 from simcore_service_catalog.api.dependencies.director import get_director_api
 from simcore_service_catalog.core.application import init_app
@@ -20,7 +20,7 @@
 
 @pytest.fixture
 def minimal_app(
-    monkeypatch: MonkeyPatch, testing_environ_vars: Dict[str, str]
+    monkeypatch: MonkeyPatch, testing_environ_vars: dict[str, str]
 ) -> Iterator[FastAPI]:
     # disable a couple of subsystems
     monkeypatch.setenv("CATALOG_POSTGRES", "null")

services/catalog/tests/unit/with_dbs/conftest.py

@@ -13,11 +13,11 @@
 import pytest
 import respx
 import sqlalchemy as sa
-from _pytest.monkeypatch import MonkeyPatch
 from faker import Faker
 from fastapi import FastAPI
 from models_library.services import ServiceDockerData
 from models_library.users import UserID
+from pytest import MonkeyPatch
 from pytest_mock.plugin import MockerFixture
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.users import UserRole, UserStatus, users

services/dask-sidecar/tests/unit/conftest.py

@@ -1,21 +1,21 @@
-# pylint:disable=unused-variable
-# pylint:disable=unused-argument
-# pylint:disable=redefined-outer-name
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
 
 from pathlib import Path
 from pprint import pformat
-from typing import Any, Callable, Dict, Iterable, Iterator, List, Optional
+from typing import Any, Callable, Iterable, Iterator, Optional
 
 import dask
 import distributed
 import fsspec
 import pytest
 import simcore_service_dask_sidecar
-from _pytest.monkeypatch import MonkeyPatch
-from _pytest.tmpdir import TempPathFactory
 from faker import Faker
 from minio import Minio
 from pydantic import AnyUrl, parse_obj_as
+from pytest import MonkeyPatch, TempPathFactory
 from pytest_localftpserver.servers import ProcessFTPServer
 from pytest_mock.plugin import MockerFixture
 from settings_library.s3 import S3Settings
@@ -53,7 +53,7 @@ def installed_package_dir() -> Path:
 
 @pytest.fixture()
 def mock_service_envs(
-    mock_env_devel_environment: Dict[str, Optional[str]],
+    mock_env_devel_environment: dict[str, Optional[str]],
     monkeypatch: MonkeyPatch,
     mocker: MockerFixture,
     tmp_path_factory: TempPathFactory,
@@ -91,7 +91,7 @@ def dask_client(mock_service_envs: None) -> Iterable[distributed.Client]:
 
 
 @pytest.fixture(scope="module")
-def ftp_server(ftpserver: ProcessFTPServer) -> List[URL]:
+def ftp_server(ftpserver: ProcessFTPServer) -> list[URL]:
     faker = Faker()
 
     files = ["file_1", "file_2", "file_3"]

services/dask-sidecar/tests/unit/test_file_utils.py

@@ -12,10 +12,10 @@
 
 import fsspec
 import pytest
-from _pytest.fixtures import FixtureRequest
 from faker import Faker
 from minio import Minio
 from pydantic import AnyUrl, parse_obj_as
+from pytest import FixtureRequest
 from pytest_localftpserver.servers import ProcessFTPServer
 from pytest_mock.plugin import MockerFixture
 from settings_library.s3 import S3Settings

services/dask-sidecar/tests/unit/test_settings.py

@@ -2,16 +2,16 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-from typing import Dict, Optional
+from typing import Optional
 
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from simcore_service_dask_sidecar.settings import Settings
 
 
 @pytest.fixture
 def mock_service_envs(
-    mock_env_devel_environment: Dict[str, Optional[str]], monkeypatch: MonkeyPatch
+    mock_env_devel_environment: dict[str, Optional[str]], monkeypatch: MonkeyPatch
 ) -> None:
 
     # Variables directly define inside Dockerfile

services/dask-sidecar/tests/unit/test_tasks.py

@@ -13,14 +13,12 @@
 from dataclasses import dataclass
 from pprint import pformat
 from random import randint
-from typing import Callable, Coroutine, Dict, Iterable, List
+from typing import Callable, Coroutine, Iterable
 from unittest import mock
 from uuid import uuid4
 
 import fsspec
 import pytest
-from _pytest.fixtures import FixtureRequest
-from _pytest.logging import LogCaptureFixture
 from dask_task_models_library.container_tasks.docker import DockerBasicAuth
 from dask_task_models_library.container_tasks.events import (
     TaskLogEvent,
@@ -39,6 +37,7 @@
 from models_library.users import UserID
 from packaging import version
 from pydantic import AnyUrl, SecretStr
+from pytest import FixtureRequest, LogCaptureFixture
 from pytest_mock.plugin import MockerFixture
 from settings_library.s3 import S3Settings
 from simcore_service_dask_sidecar.computational_sidecar.docker_utils import (
@@ -78,7 +77,7 @@ def node_id() -> NodeID:
 
 
 @pytest.fixture()
-def dask_subsystem_mock(mocker: MockerFixture) -> Dict[str, MockerFixture]:
+def dask_subsystem_mock(mocker: MockerFixture) -> dict[str, MockerFixture]:
     # mock dask client
     dask_client_mock = mocker.patch("distributed.Client", autospec=True)
 
@@ -129,12 +128,12 @@ class ServiceExampleParam:
     docker_basic_auth: DockerBasicAuth
     service_key: str
     service_version: str
-    command: List[str]
+    command: list[str]
     input_data: TaskInputData
     output_data_keys: TaskOutputDataSchema
     log_file_url: AnyUrl
     expected_output_data: TaskOutputData
-    expected_logs: List[str]
+    expected_logs: list[str]
     integration_version: version.Version
 
 
@@ -328,7 +327,7 @@ def test_run_computational_sidecar_real_fct(
     caplog_info_level: LogCaptureFixture,
     event_loop: asyncio.AbstractEventLoop,
     mock_service_envs: None,
-    dask_subsystem_mock: Dict[str, MockerFixture],
+    dask_subsystem_mock: dict[str, MockerFixture],
     ubuntu_task: ServiceExampleParam,
     mocker: MockerFixture,
     s3_settings: S3Settings,
@@ -500,7 +499,7 @@ def test_failing_service_raises_exception(
     caplog_info_level: LogCaptureFixture,
     event_loop: asyncio.AbstractEventLoop,
     mock_service_envs: None,
-    dask_subsystem_mock: Dict[str, MockerFixture],
+    dask_subsystem_mock: dict[str, MockerFixture],
     ubuntu_task_fail: ServiceExampleParam,
     s3_settings: S3Settings,
 ):
@@ -521,7 +520,7 @@ def test_running_service_that_generates_unexpected_data_raises_exception(
     caplog_info_level: LogCaptureFixture,
     event_loop: asyncio.AbstractEventLoop,
     mock_service_envs: None,
-    dask_subsystem_mock: Dict[str, MockerFixture],
+    dask_subsystem_mock: dict[str, MockerFixture],
     ubuntu_task_unexpected_output: ServiceExampleParam,
     s3_settings: S3Settings,
 ):

services/dask-sidecar/tests/unit/test_utils.py

@@ -4,19 +4,19 @@
 
 
 import asyncio
-from typing import Dict, List, Optional
+from typing import Optional
 from unittest import mock
 
 import aiodocker
 import pytest
-from _pytest.monkeypatch import MonkeyPatch
+from pytest import MonkeyPatch
 from pytest_mock.plugin import MockerFixture
 from simcore_service_dask_sidecar.utils import num_available_gpus
 
 
 @pytest.fixture
 def mock_service_envs(
-    mock_env_devel_environment: Dict[str, Optional[str]], monkeypatch: MonkeyPatch
+    mock_env_devel_environment: dict[str, Optional[str]], monkeypatch: MonkeyPatch
 ) -> None:
     monkeypatch.setenv(
         "SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME", "simcore_computational_shared_data"
@@ -99,7 +99,7 @@ def test_num_available_gpus_returns_0_when_container_wait_timesout(
 def test_num_available_gpus(
     event_loop: asyncio.events.AbstractEventLoop,
     mock_service_envs: None,
-    container_logs: List[str],
+    container_logs: list[str],
     expected_num_gpus: int,
     mock_aiodocker: mock.MagicMock,
 ):

services/datcore-adapter/tests/unit/conftest.py

@@ -12,9 +12,9 @@
 import pytest
 import respx
 import simcore_service_datcore_adapter
-from _pytest.monkeypatch import MonkeyPatch
 from asgi_lifespan import LifespanManager
 from fastapi.applications import FastAPI
+from pytest import MonkeyPatch
 from pytest_mock import MockFixture
 from simcore_service_datcore_adapter.modules.pennsieve import (
     PennsieveAuthorizationHeaders,

services/director-v2/tests/integration/01/test_computation_api.py

@@ -15,14 +15,14 @@
 import httpx
 import pytest
 import sqlalchemy as sa
-from _pytest.monkeypatch import MonkeyPatch
 from httpx import AsyncClient
 from models_library.clusters import DEFAULT_CLUSTER_ID
 from models_library.projects import ProjectAtDB
 from models_library.projects_nodes import NodeState
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_pipeline import PipelineDetails
 from models_library.projects_state import RunningState
+from pytest import MonkeyPatch
 from settings_library.rabbit import RabbitSettings
 from shared_comp_utils import (
     COMPUTATION_URL,

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

@@ -12,11 +12,11 @@
 import httpx
 import pytest
 import sqlalchemy as sa
-from _pytest.monkeypatch import MonkeyPatch
 from asgi_lifespan import LifespanManager
 from faker import Faker
 from models_library.projects import ProjectAtDB
 from models_library.services_resources import ServiceResourcesDict
+from pytest import MonkeyPatch
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.utils_docker import get_localhost_ip
 from settings_library.rabbit import RabbitSettings