♻️ Maintenance: pytest-simcore initial cleanup (#5986)

Author: pcrespov

packages/aws-library/tests/conftest.py

@@ -7,13 +7,13 @@
 import pytest
 
 pytest_plugins = [
-    "pytest_simcore.aws_server",
     "pytest_simcore.aws_ec2_service",
     "pytest_simcore.aws_s3_service",
+    "pytest_simcore.aws_server",
     "pytest_simcore.environment_configs",
-    "pytest_simcore.repository_paths",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/aws-library/tests/test_s3_client.py

@@ -17,7 +17,7 @@
 from models_library.api_schemas_storage import S3BucketName
 from moto.server import ThreadedMotoServer
 from pydantic import AnyUrl
-from pytest_simcore.helpers.utils_envs import EnvVarsDict
+from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 from settings_library.s3 import S3Settings
 from types_aiobotocore_s3 import S3Client
 

packages/dask-task-models-library/tests/conftest.py

@@ -7,9 +7,9 @@
 import pytest
 
 pytest_plugins = [
-    "pytest_simcore.repository_paths",
     "pytest_simcore.pydantic_models",
     "pytest_simcore.pytest_global_environs",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/models-library/tests/test_utils_string_substitution.py

@@ -15,7 +15,7 @@
     substitute_all_legacy_identifiers,
     upgrade_identifier,
 )
-from pytest_simcore.helpers.utils_envs import load_dotenv
+from pytest_simcore.helpers.monkeypatch_envs import load_dotenv
 
 
 @pytest.mark.parametrize(

packages/notifications-library/tests/conftest.py

@@ -17,15 +17,14 @@
 from simcore_postgres_database.models.products import Vendor
 
 pytest_plugins = [
+    "pytest_simcore.docker_compose",
+    "pytest_simcore.docker_swarm",
     "pytest_simcore.environment_configs",
-    "pytest_simcore.repository_paths",
     "pytest_simcore.faker_payments_data",
     "pytest_simcore.faker_products_data",
     "pytest_simcore.faker_users_data",
-    "pytest_simcore.docker_compose",
     "pytest_simcore.postgres_service",
-    "pytest_simcore.docker_swarm",
-    "pytest_simcore.tmp_path_extra",
+    "pytest_simcore.repository_paths",
 ]
 
 

packages/notifications-library/tests/email/conftest.py

@@ -3,8 +3,8 @@
 import pytest
 from pydantic import EmailStr
 from pytest_mock import MockerFixture
+from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.helpers.utils_envs import setenvs_from_dict
 
 
 @pytest.fixture

packages/postgres-database/tests/conftest.py

@@ -16,7 +16,7 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import (
+from pytest_simcore.helpers.faker_factories import (
     random_group,
     random_project,
     random_user,

packages/postgres-database/tests/products/conftest.py

@@ -9,7 +9,7 @@
 import pytest
 from aiopg.sa.exc import ResourceClosedError
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_product
+from pytest_simcore.helpers.faker_factories import random_product
 from simcore_postgres_database.webserver_models import products
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 

packages/postgres-database/tests/projects/conftest.py

@@ -10,7 +10,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
-from pytest_simcore.helpers.rawdata_fakers import random_project, random_user
+from pytest_simcore.helpers.faker_factories import random_project, random_user
 from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.users import users
 

packages/postgres-database/tests/test_classifiers.py

@@ -10,7 +10,7 @@
 import pytest
 import sqlalchemy as sa
 from aiopg.sa.engine import Engine
-from pytest_simcore.helpers.rawdata_fakers import random_group
+from pytest_simcore.helpers.faker_factories import random_group
 from simcore_postgres_database.models.classifiers import group_classifiers
 from simcore_postgres_database.models.groups import groups
 from sqlalchemy import func, literal_column

packages/postgres-database/tests/test_clusters.py

@@ -8,7 +8,7 @@
 import sqlalchemy as sa
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy
-from pytest_simcore.helpers.rawdata_fakers import random_user
+from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.errors import ForeignKeyViolation, NotNullViolation
 from simcore_postgres_database.models.cluster_to_groups import cluster_to_groups
 from simcore_postgres_database.models.clusters import ClusterType, clusters

packages/postgres-database/tests/test_delete_projects_and_users.py

@@ -9,7 +9,7 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from psycopg2.errors import ForeignKeyViolation
-from pytest_simcore.helpers.rawdata_fakers import random_project, random_user
+from pytest_simcore.helpers.faker_factories import random_project, random_user
 from simcore_postgres_database.webserver_models import projects, users
 from sqlalchemy import func
 

packages/postgres-database/tests/test_groups.py

@@ -13,7 +13,7 @@
 from aiopg.sa.engine import Engine
 from aiopg.sa.result import ResultProxy, RowProxy
 from psycopg2.errors import ForeignKeyViolation, RaiseException, UniqueViolation
-from pytest_simcore.helpers.rawdata_fakers import random_user
+from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.models.base import metadata
 from simcore_postgres_database.webserver_models import (
     GroupType,

packages/postgres-database/tests/test_models_api_keys.py

@@ -9,7 +9,7 @@
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
-from pytest_simcore.helpers.rawdata_fakers import (
+from pytest_simcore.helpers.faker_factories import (
     random_api_key,
     random_product,
     random_user,

packages/postgres-database/tests/test_models_payments_methods.py

@@ -9,7 +9,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_payment_method
+from pytest_simcore.helpers.faker_factories import random_payment_method
 from simcore_postgres_database.errors import UniqueViolation
 from simcore_postgres_database.models.payments_methods import (
     InitPromptAckFlowState,

packages/postgres-database/tests/test_models_payments_transactions.py

@@ -11,7 +11,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_payment_transaction, utcnow
+from pytest_simcore.helpers.faker_factories import random_payment_transaction, utcnow
 from simcore_postgres_database.models.payments_transactions import (
     PaymentTransactionState,
     payments_transactions,

packages/postgres-database/tests/test_models_products_prices.py

@@ -9,7 +9,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_product
+from pytest_simcore.helpers.faker_factories import random_product
 from simcore_postgres_database.errors import CheckViolation, ForeignKeyViolation
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.products_prices import products_prices

packages/postgres-database/tests/test_services_consume_filetypes.py

@@ -11,7 +11,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.exc import ResourceClosedError
 from aiopg.sa.result import ResultProxy, RowProxy
-from pytest_simcore.helpers.utils_services import (
+from pytest_simcore.helpers.webserver_fake_services_data import (
     FAKE_FILE_CONSUMER_SERVICES,
     list_supported_filetypes,
 )

packages/postgres-database/tests/test_uniqueness_in_comp_tasks.py

@@ -8,7 +8,7 @@
 import pytest
 import sqlalchemy as sa
 from psycopg2.errors import UniqueViolation  # pylint: disable=no-name-in-module
-from pytest_simcore.helpers.rawdata_fakers import fake_pipeline, fake_task_factory
+from pytest_simcore.helpers.faker_factories import fake_pipeline, fake_task_factory
 from simcore_postgres_database.models.base import metadata
 from simcore_postgres_database.webserver_models import comp_pipeline, comp_tasks
 

packages/postgres-database/tests/test_users.py

@@ -10,7 +10,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import ResultProxy, RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_user
+from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.errors import InvalidTextRepresentation, UniqueViolation
 from simcore_postgres_database.models.users import (
     _USER_ROLE_TO_LEVEL,

packages/postgres-database/tests/test_users_details.py

@@ -10,7 +10,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import (
+from pytest_simcore.helpers.faker_factories import (
     random_pre_registration_details,
     random_user,
 )

packages/postgres-database/tests/test_utils_payments_autorecharge.py

@@ -11,7 +11,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_payment_method, utcnow
+from pytest_simcore.helpers.faker_factories import random_payment_method, utcnow
 from simcore_postgres_database.models.payments_methods import (
     InitPromptAckFlowState,
     payments_methods,

packages/postgres-database/tests/test_utils_services.py

@@ -9,7 +9,7 @@
 import pytest
 import sqlalchemy as sa
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_group
+from pytest_simcore.helpers.faker_factories import random_group
 from simcore_postgres_database.models.groups import GroupType, groups
 from simcore_postgres_database.models.products import products
 from simcore_postgres_database.models.services import (

packages/postgres-database/tests/test_utils_tags.py

@@ -10,7 +10,7 @@
 import sqlalchemy as sa
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
-from pytest_simcore.helpers.utils_tags import create_tag, create_tag_access
+from pytest_simcore.helpers.postgres_tags import create_tag, create_tag_access
 from simcore_postgres_database.models.tags import tags_to_groups
 from simcore_postgres_database.models.users import UserRole, UserStatus
 from simcore_postgres_database.utils_tags import (

packages/postgres-database/tests/test_utils_user_preferences.py

@@ -8,7 +8,7 @@
 from aiopg.sa.connection import SAConnection
 from aiopg.sa.result import RowProxy
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_user
+from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.models.users import UserRole, users
 from simcore_postgres_database.utils_user_preferences import (
     BasePreferencesRepo,

packages/postgres-database/tests/test_utils_users.py

@@ -9,7 +9,7 @@
 import pytest
 from aiopg.sa.connection import SAConnection
 from faker import Faker
-from pytest_simcore.helpers.rawdata_fakers import random_user
+from pytest_simcore.helpers.faker_factories import random_user
 from simcore_postgres_database.models.users import UserRole, users
 from simcore_postgres_database.utils_users import UserNotFoundInRepoError, UsersRepo
 

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

@@ -1,6 +1,5 @@
 # Collection of tests fixtures for integration testing
 from importlib.metadata import version
-from pathlib import Path
 
 import pytest
 
@@ -16,8 +15,11 @@ def pytest_addoption(parser: pytest.Parser):
         help="Keep stack/registry up after fixtures closes",
     )
 
-    # DUMMY
-    parser.addini("HELLO", "Dummy pytest.ini setting")
+
+@pytest.fixture(scope="session")
+def keep_docker_up(request: pytest.FixtureRequest) -> bool:
+    flag: bool = bool(request.config.getoption(name="--keep-docker-up", default=False))
+    return flag
 
 
 @pytest.fixture

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

@@ -3,7 +3,7 @@
 import pytest
 from aioresponses import aioresponses as AioResponsesMock  # noqa: N812
 
-from .helpers.utils_host import get_localhost_ip
+from .helpers.host import get_localhost_ip
 
 # WARNING: any request done through the client will go through aioresponses. It is
 # unfortunate but that means any valid request (like calling the test server) prefix must be set as passthrough.

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

@@ -13,8 +13,8 @@
 from settings_library.ec2 import EC2Settings
 from settings_library.s3 import S3Settings
 
-from .helpers.utils_envs import EnvVarsDict, setenvs_from_dict
-from .helpers.utils_host import get_localhost_ip
+from .helpers.host import get_localhost_ip
+from .helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict
 
 
 @pytest.fixture(scope="module")

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

@@ -6,7 +6,7 @@
 # Based on https://github.com/Stranger6667/pytest-click
 
 
-from typing import Iterator
+from collections.abc import Iterator
 
 import pytest
 from typer.testing import CliRunner

packages/pytest-simcore/src/pytest_simcore/container_pause.py renamed to packages/pytest-simcore/src/pytest_simcore/docker.py

@@ -28,9 +28,20 @@
     FIXTURE_CONFIG_OPS_SERVICES_SELECTION,
 )
 from .helpers.constants import HEADER_STR
+from .helpers.docker import run_docker_compose_config, save_docker_infos
+from .helpers.host import get_localhost_ip
 from .helpers.typing_env import EnvVarsDict
-from .helpers.utils_docker import run_docker_compose_config, save_docker_infos
-from .helpers.utils_host import get_localhost_ip
+
+
+@pytest.fixture(scope="module")
+def temp_folder(
+    request: pytest.FixtureRequest, tmp_path_factory: pytest.TempPathFactory
+) -> Path:
+    """**Module scoped** temporary folder"""
+    prefix = __name__.replace(".", "_")
+    return tmp_path_factory.mktemp(
+        basename=f"{prefix}_temp_folder_{request.module.__name__}", numbered=True
+    )
 
 
 @pytest.fixture(scope="session")
@@ -88,8 +99,8 @@ def testing_environ_vars(env_devel_file: Path) -> EnvVarsDict:
 
 @pytest.fixture(scope="module")
 def env_file_for_testing(
-    testing_environ_vars: dict[str, str],
     temp_folder: Path,
+    testing_environ_vars: dict[str, str],
     osparc_simcore_root_dir: Path,
 ) -> Iterator[Path]:
     """Dumps all the environment variables into an $(temp_folder)/.env.test file

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

@@ -16,11 +16,11 @@
 import jsonschema
 import pytest
 import tenacity
+from pytest_simcore.helpers.logging import log_context
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.logging_utils import log_context
 from settings_library.docker_registry import RegistrySettings
 
-from .helpers.utils_host import get_localhost_ip
+from .helpers.host import get_localhost_ip
 
 log = logging.getLogger(__name__)
 

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

@@ -23,9 +23,9 @@
 from tenacity.wait import wait_fixed, wait_random_exponential
 
 from .helpers.constants import HEADER_STR, MINUTE
+from .helpers.dict_tools import copy_from_dict
+from .helpers.host import get_localhost_ip
 from .helpers.typing_env import EnvVarsDict
-from .helpers.utils_dict import copy_from_dict
-from .helpers.utils_host import get_localhost_ip
 
 log = logging.getLogger(__name__)
 
@@ -146,12 +146,6 @@ def docker_client() -> Iterator[docker.client.DockerClient]:
     client.close()
 
 
-@pytest.fixture(scope="session")
-def keep_docker_up(request: pytest.FixtureRequest) -> bool:
-    flag: bool = request.config.getoption(name="--keep-docker-up", default=False)
-    return flag
-
-
 @pytest.fixture(scope="module")
 def docker_swarm(
     docker_client: docker.client.DockerClient, keep_docker_up: bool

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

@@ -9,8 +9,8 @@
 
 import pytest
 
+from .helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict
 from .helpers.typing_env import EnvVarsDict
-from .helpers.utils_envs import load_dotenv, setenvs_from_dict
 
 
 def pytest_addoption(parser: pytest.Parser):

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

@@ -29,7 +29,7 @@
     PaymentTransactionState,
 )
 
-from .helpers.rawdata_fakers import random_payment_transaction
+from .helpers.faker_factories import random_payment_transaction
 
 
 @pytest.fixture