diff --git a/packages/aws-library/tests/conftest.py b/packages/aws-library/tests/conftest.py index e3aca9457e9..af911581920 100644 --- a/packages/aws-library/tests/conftest.py +++ b/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", ] diff --git a/packages/aws-library/tests/test_s3_client.py b/packages/aws-library/tests/test_s3_client.py index a6ee8c3033f..92fc77cbfef 100644 --- a/packages/aws-library/tests/test_s3_client.py +++ b/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 diff --git a/packages/dask-task-models-library/tests/conftest.py b/packages/dask-task-models-library/tests/conftest.py index b98e60ad64d..e551898ea95 100644 --- a/packages/dask-task-models-library/tests/conftest.py +++ b/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", ] diff --git a/packages/models-library/tests/test_utils_string_substitution.py b/packages/models-library/tests/test_utils_string_substitution.py index 59aade68d2b..cfc627ae819 100644 --- a/packages/models-library/tests/test_utils_string_substitution.py +++ b/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( diff --git a/packages/notifications-library/tests/conftest.py b/packages/notifications-library/tests/conftest.py index 0be979be507..4570801119a 100644 --- a/packages/notifications-library/tests/conftest.py +++ b/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", ] diff --git a/packages/notifications-library/tests/email/conftest.py b/packages/notifications-library/tests/email/conftest.py index cd05fc6eddd..f0f47f0e3d2 100644 --- a/packages/notifications-library/tests/email/conftest.py +++ b/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 diff --git a/packages/postgres-database/tests/conftest.py b/packages/postgres-database/tests/conftest.py index 65e36b91406..72b4ed4cf11 100644 --- a/packages/postgres-database/tests/conftest.py +++ b/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, diff --git a/packages/postgres-database/tests/products/conftest.py b/packages/postgres-database/tests/products/conftest.py index 60eaf7a736c..eb3d213c249 100644 --- a/packages/postgres-database/tests/products/conftest.py +++ b/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 diff --git a/packages/postgres-database/tests/projects/conftest.py b/packages/postgres-database/tests/projects/conftest.py index f1623ac4be6..fb507557fbf 100644 --- a/packages/postgres-database/tests/projects/conftest.py +++ b/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 diff --git a/packages/postgres-database/tests/test_classifiers.py b/packages/postgres-database/tests/test_classifiers.py index 91e8b1e4cc0..f53740a124d 100644 --- a/packages/postgres-database/tests/test_classifiers.py +++ b/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 diff --git a/packages/postgres-database/tests/test_clusters.py b/packages/postgres-database/tests/test_clusters.py index a83898d1c74..6dccc8ef153 100644 --- a/packages/postgres-database/tests/test_clusters.py +++ b/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 diff --git a/packages/postgres-database/tests/test_delete_projects_and_users.py b/packages/postgres-database/tests/test_delete_projects_and_users.py index c86c567e2ca..b0e0edacef8 100644 --- a/packages/postgres-database/tests/test_delete_projects_and_users.py +++ b/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 diff --git a/packages/postgres-database/tests/test_groups.py b/packages/postgres-database/tests/test_groups.py index 2b222f8b896..649e2111867 100644 --- a/packages/postgres-database/tests/test_groups.py +++ b/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, diff --git a/packages/postgres-database/tests/test_models_api_keys.py b/packages/postgres-database/tests/test_models_api_keys.py index ab5cb83b114..2c5de1a56a8 100644 --- a/packages/postgres-database/tests/test_models_api_keys.py +++ b/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, diff --git a/packages/postgres-database/tests/test_models_payments_methods.py b/packages/postgres-database/tests/test_models_payments_methods.py index 2dc3760a71d..100c0e5431b 100644 --- a/packages/postgres-database/tests/test_models_payments_methods.py +++ b/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, diff --git a/packages/postgres-database/tests/test_models_payments_transactions.py b/packages/postgres-database/tests/test_models_payments_transactions.py index 278dbb62fa5..6a0e6892bc9 100644 --- a/packages/postgres-database/tests/test_models_payments_transactions.py +++ b/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, diff --git a/packages/postgres-database/tests/test_models_products_prices.py b/packages/postgres-database/tests/test_models_products_prices.py index 9c1f28070ab..7112f31b612 100644 --- a/packages/postgres-database/tests/test_models_products_prices.py +++ b/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 diff --git a/packages/postgres-database/tests/test_services_consume_filetypes.py b/packages/postgres-database/tests/test_services_consume_filetypes.py index d1ee3638af9..88c68dadc7c 100644 --- a/packages/postgres-database/tests/test_services_consume_filetypes.py +++ b/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, ) diff --git a/packages/postgres-database/tests/test_uniqueness_in_comp_tasks.py b/packages/postgres-database/tests/test_uniqueness_in_comp_tasks.py index 4058ae99c9c..80b9b28e514 100644 --- a/packages/postgres-database/tests/test_uniqueness_in_comp_tasks.py +++ b/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 diff --git a/packages/postgres-database/tests/test_users.py b/packages/postgres-database/tests/test_users.py index 078c964fc52..97bfa3b2f99 100644 --- a/packages/postgres-database/tests/test_users.py +++ b/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, diff --git a/packages/postgres-database/tests/test_users_details.py b/packages/postgres-database/tests/test_users_details.py index 6a19cd007f5..f99ab6396f0 100644 --- a/packages/postgres-database/tests/test_users_details.py +++ b/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, ) diff --git a/packages/postgres-database/tests/test_utils_payments_autorecharge.py b/packages/postgres-database/tests/test_utils_payments_autorecharge.py index fa8a67dd0e8..1746b8720cc 100644 --- a/packages/postgres-database/tests/test_utils_payments_autorecharge.py +++ b/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, diff --git a/packages/postgres-database/tests/test_utils_services.py b/packages/postgres-database/tests/test_utils_services.py index 4c9c86a50ca..70b102fea70 100644 --- a/packages/postgres-database/tests/test_utils_services.py +++ b/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 ( diff --git a/packages/postgres-database/tests/test_utils_tags.py b/packages/postgres-database/tests/test_utils_tags.py index 191d2ddb549..86fca7dfaef 100644 --- a/packages/postgres-database/tests/test_utils_tags.py +++ b/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 ( diff --git a/packages/postgres-database/tests/test_utils_user_preferences.py b/packages/postgres-database/tests/test_utils_user_preferences.py index 83764ecc02c..d432708e9e9 100644 --- a/packages/postgres-database/tests/test_utils_user_preferences.py +++ b/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, diff --git a/packages/postgres-database/tests/test_utils_users.py b/packages/postgres-database/tests/test_utils_users.py index 1f6960e6748..5ee6cf11038 100644 --- a/packages/postgres-database/tests/test_utils_users.py +++ b/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 diff --git a/packages/pytest-simcore/src/pytest_simcore/__init__.py b/packages/pytest-simcore/src/pytest_simcore/__init__.py index 5fa2fa4edd5..60638a8946e 100644 --- a/packages/pytest-simcore/src/pytest_simcore/__init__.py +++ b/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 diff --git a/packages/pytest-simcore/src/pytest_simcore/aioresponses_mocker.py b/packages/pytest-simcore/src/pytest_simcore/aioresponses_mocker.py index f74d4db6617..a81a87acfea 100644 --- a/packages/pytest-simcore/src/pytest_simcore/aioresponses_mocker.py +++ b/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. diff --git a/packages/pytest-simcore/src/pytest_simcore/aws_server.py b/packages/pytest-simcore/src/pytest_simcore/aws_server.py index aaf3932c80a..96e05999abf 100644 --- a/packages/pytest-simcore/src/pytest_simcore/aws_server.py +++ b/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") diff --git a/packages/pytest-simcore/src/pytest_simcore/cli_runner.py b/packages/pytest-simcore/src/pytest_simcore/cli_runner.py index 0c643102b65..81dbbfdd98e 100644 --- a/packages/pytest-simcore/src/pytest_simcore/cli_runner.py +++ b/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 diff --git a/packages/pytest-simcore/src/pytest_simcore/container_pause.py b/packages/pytest-simcore/src/pytest_simcore/docker.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/container_pause.py rename to packages/pytest-simcore/src/pytest_simcore/docker.py diff --git a/packages/pytest-simcore/src/pytest_simcore/docker_compose.py b/packages/pytest-simcore/src/pytest_simcore/docker_compose.py index 138f458bf48..a242e819b19 100644 --- a/packages/pytest-simcore/src/pytest_simcore/docker_compose.py +++ b/packages/pytest-simcore/src/pytest_simcore/docker_compose.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 diff --git a/packages/pytest-simcore/src/pytest_simcore/docker_registry.py b/packages/pytest-simcore/src/pytest_simcore/docker_registry.py index eb8e9968988..47508c9d8e2 100644 --- a/packages/pytest-simcore/src/pytest_simcore/docker_registry.py +++ b/packages/pytest-simcore/src/pytest_simcore/docker_registry.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__) diff --git a/packages/pytest-simcore/src/pytest_simcore/docker_swarm.py b/packages/pytest-simcore/src/pytest_simcore/docker_swarm.py index b06c51aa77c..2ce2bc522bd 100644 --- a/packages/pytest-simcore/src/pytest_simcore/docker_swarm.py +++ b/packages/pytest-simcore/src/pytest_simcore/docker_swarm.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 diff --git a/packages/pytest-simcore/src/pytest_simcore/environment_configs.py b/packages/pytest-simcore/src/pytest_simcore/environment_configs.py index 7317f18530b..1f5b9334ac4 100644 --- a/packages/pytest-simcore/src/pytest_simcore/environment_configs.py +++ b/packages/pytest-simcore/src/pytest_simcore/environment_configs.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): diff --git a/packages/pytest-simcore/src/pytest_simcore/faker_payments_data.py b/packages/pytest-simcore/src/pytest_simcore/faker_payments_data.py index 55e65cd9655..9d675c45e11 100644 --- a/packages/pytest-simcore/src/pytest_simcore/faker_payments_data.py +++ b/packages/pytest-simcore/src/pytest_simcore/faker_payments_data.py @@ -29,7 +29,7 @@ PaymentTransactionState, ) -from .helpers.rawdata_fakers import random_payment_transaction +from .helpers.faker_factories import random_payment_transaction @pytest.fixture diff --git a/packages/pytest-simcore/src/pytest_simcore/faker_products_data.py b/packages/pytest-simcore/src/pytest_simcore/faker_products_data.py index ea6965ff64f..f82636b6633 100644 --- a/packages/pytest-simcore/src/pytest_simcore/faker_products_data.py +++ b/packages/pytest-simcore/src/pytest_simcore/faker_products_data.py @@ -16,7 +16,7 @@ from models_library.products import ProductName, StripePriceID, StripeTaxRateID from pydantic import EmailStr, parse_obj_as -from .helpers.rawdata_fakers import random_product +from .helpers.faker_factories import random_product _MESSAGE = ( "If set, it overrides the fake value of `{}` fixture." diff --git a/packages/pytest-simcore/src/pytest_simcore/faker_users_data.py b/packages/pytest-simcore/src/pytest_simcore/faker_users_data.py index c5fd1e6da89..6ba011db47c 100644 --- a/packages/pytest-simcore/src/pytest_simcore/faker_users_data.py +++ b/packages/pytest-simcore/src/pytest_simcore/faker_users_data.py @@ -16,7 +16,7 @@ from models_library.users import UserID from pydantic import EmailStr, parse_obj_as -from .helpers.rawdata_fakers import DEFAULT_TEST_PASSWORD, random_user +from .helpers.faker_factories import DEFAULT_TEST_PASSWORD, random_user _MESSAGE = ( "If set, it overrides the fake value of `{}` fixture." diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_assert.py b/packages/pytest-simcore/src/pytest_simcore/helpers/assert_checks.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_assert.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/assert_checks.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_environs.py b/packages/pytest-simcore/src/pytest_simcore/helpers/deprecated_environs.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_environs.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/deprecated_environs.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_dict.py b/packages/pytest-simcore/src/pytest_simcore/helpers/dict_tools.py similarity index 89% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_dict.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/dict_tools.py index 02d451b7da1..b31123d5ff5 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_dict.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/dict_tools.py @@ -1,7 +1,7 @@ """ Utils to operate with dicts """ from copy import deepcopy -from typing import Any, Mapping, Optional, Union +from typing import Any, Mapping ConfigDict = dict[str, Any] @@ -20,10 +20,7 @@ def copy_from_dict_ex(data: dict[str, Any], exclude: set[str]) -> dict[str, Any] def copy_from_dict( - data: dict[str, Any], - *, - include: Optional[Union[set, dict]] = None, - deep: bool = False + data: dict[str, Any], *, include: set | dict | None = None, deep: bool = False ): # # Analogous to advanced includes from pydantic exports diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_docker.py b/packages/pytest-simcore/src/pytest_simcore/helpers/docker.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_docker.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/docker.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_docker_registry.py b/packages/pytest-simcore/src/pytest_simcore/helpers/docker_registry.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_docker_registry.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/docker_registry.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/rawdata_fakers.py b/packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/rawdata_fakers.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/faker_factories.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_host.py b/packages/pytest-simcore/src/pytest_simcore/helpers/host.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_host.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/host.py diff --git a/packages/pytest-simcore/src/pytest_simcore/logging_utils.py b/packages/pytest-simcore/src/pytest_simcore/helpers/logging.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/logging_utils.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/logging.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_envs.py b/packages/pytest-simcore/src/pytest_simcore/helpers/monkeypatch_envs.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_envs.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/monkeypatch_envs.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_parametrizations.py b/packages/pytest-simcore/src/pytest_simcore/helpers/parametrizations.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_parametrizations.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/parametrizations.py diff --git a/packages/pytest-simcore/src/pytest_simcore/playwright_utils.py b/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py similarity index 99% rename from packages/pytest-simcore/src/pytest_simcore/playwright_utils.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py index 11fccadd431..9f7dca473ee 100644 --- a/packages/pytest-simcore/src/pytest_simcore/playwright_utils.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py @@ -9,7 +9,7 @@ from typing import Any, Final from playwright.sync_api import FrameLocator, Page, Request, WebSocket, expect -from pytest_simcore.logging_utils import log_context +from pytest_simcore.helpers.logging import log_context SECOND: Final[int] = 1000 MINUTE: Final[int] = 60 * SECOND diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_tags.py b/packages/pytest-simcore/src/pytest_simcore/helpers/postgres_tags.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_tags.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/postgres_tags.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_postgres.py b/packages/pytest-simcore/src/pytest_simcore/helpers/postgres_tools.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_postgres.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/postgres_tools.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_scrunch_citations.py b/packages/pytest-simcore/src/pytest_simcore/helpers/scrunch_citations.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_scrunch_citations.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/scrunch_citations.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_public_api.py b/packages/pytest-simcore/src/pytest_simcore/helpers/typing_public_api.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_public_api.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/typing_public_api.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_rate_limit.py b/packages/pytest-simcore/src/pytest_simcore/helpers/utils_rate_limit.py deleted file mode 100644 index 03e3c987d92..00000000000 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_rate_limit.py +++ /dev/null @@ -1,186 +0,0 @@ -import asyncio -import logging -import math -import time -from functools import wraps -from typing import Awaitable - -from aiohttp import ClientResponse, ClientSession, ClientTimeout - -log = logging.getLogger() - - -def function_duration(func): - @wraps(func) - async def wrapper(*args, **kwargs): - start = time.time() - result = await func(*args, **kwargs) - end = time.time() - elapsed = end - start - log.info("Function '%s' execution took '%0.2f' seconds", func.__name__, elapsed) - return result - - return wrapper - - -def is_rate_limit_reached(result: ClientResponse) -> bool: - return "Retry-After" in result.headers - - -async def get_request_result( - client: ClientSession, endpoint_to_check: str -) -> ClientResponse: - result = await client.get(endpoint_to_check) - log.debug("%s\n%s\n%s", result, await result.text(), dict(result.headers)) - return result - - -async def assert_burst_request( - client: ClientSession, - endpoint_to_check: str, - burst: int, -): - functions = [get_request_result(client, endpoint_to_check) for x in range(burst)] - results = await asyncio.gather(*functions) - for result in results: - assert is_rate_limit_reached(result) is False - - -@function_duration -async def assert_burst_rate_limit( - endpoint_to_check: str, average: int, period_sec: int, burst: int -) -> float: - """ - Runs 2 burst sequences with a pause in between and expects for the - next result to fail. - """ - - max_rate = period_sec / average - # sleeping 2 times the burst window - burst_window = period_sec / burst - sleep_internval = 2 * burst_window - - log.info( - "Sleeping params: burst_window=%s, sleep_interval=%s, max_rate=%s", - burst_window, - sleep_internval, - max_rate, - ) - - timeout = ClientTimeout(total=10, connect=1, sock_connect=1) - async with ClientSession(timeout=timeout) as client: - - # check can burst in timeframe - await assert_burst_request( - client=client, endpoint_to_check=endpoint_to_check, burst=burst - ) - - log.info("First burst finished") - - await asyncio.sleep(sleep_internval) - - # check that burst in timeframe is ok - await assert_burst_request( - client=client, endpoint_to_check=endpoint_to_check, burst=burst - ) - - log.info("Second burst finished") - - # check that another request after the burst fails - result = await get_request_result(client, endpoint_to_check) - assert is_rate_limit_reached(result) is True - - return sleep_internval - - -@function_duration -async def assert_steady_rate_in_5_seconds( - endpoint_to_check: str, average: int, period_sec: int, **_ -) -> float: - """Creates a requests at a continuous rate without considering burst limits""" - # run tests for at least 5 seconds - max_rate = period_sec / average # reqs/ sec - requests_to_make = int(math.ceil(max_rate * 5)) - - sleep_interval = max_rate - - log.info( - "Steady rate params: sleep_interval=%s, max_rate=%s, requests_to_make=%s", - sleep_interval, - max_rate, - requests_to_make, - ) - - timeout = ClientTimeout(total=10, connect=1, sock_connect=1) - async with ClientSession(timeout=timeout) as client: - - for i in range(requests_to_make): - log.info("Request %s", i) - result = await get_request_result(client, endpoint_to_check) - assert is_rate_limit_reached(result) is False - log.info("Sleeping for %s s", sleep_interval) - await asyncio.sleep(sleep_interval) - - return sleep_interval - - -CHECKS_TO_RUN: list[Awaitable] = [ - assert_steady_rate_in_5_seconds, - assert_burst_rate_limit, -] - - -@function_duration -async def run_rate_limit_configuration_checks( - endpoint_to_check: str, average: int = 0, period_sec: int = 1, burst: int = 1 -): - """ - Runner to start all the checks for the firewall configuration - - All tests mut return the period to sleep before the next test can start. - - All defaults are taken from Traefik's docs - SEE https://doc.traefik.io/traefik/middlewares/ratelimit/ - """ - - log.warning( - "Runtime will vary based on the rate limit configuration of the service\n" - ) - - for awaitable in CHECKS_TO_RUN: - log.info("<<<< Starting test '%s'...", awaitable.__name__) - sleep_before_next_test = await awaitable( - endpoint_to_check=endpoint_to_check, - average=average, - period_sec=period_sec, - burst=burst, - ) - log.info(">>>> Finished testing '%s'\n", awaitable.__name__) - - log.info(">>>> Sleeping '%s' seconds before next test", sleep_before_next_test) - await asyncio.sleep(sleep_before_next_test) - - log.info("All tests completed") - - -if __name__ == "__main__": - logging.basicConfig( - level=logging.INFO, - format="%(asctime)s %(levelname)s %(threadName)s [%(name)s] %(message)s", - ) - - # How to use, the below parameters are derived from the following labels: - # - traefik.http.middlewares.ratelimit-${SWARM_STACK_NAME}_api-server.ratelimit.average=1 - # - traefik.http.middlewares.ratelimit-${SWARM_STACK_NAME}_api-server.ratelimit.period=1m - # - traefik.http.middlewares.ratelimit-${SWARM_STACK_NAME}_api-server.ratelimit.burst=10 - # Will result in: average=1, period_sec=60, burst=10 - # WARNING: in the above example the test will run for 5 hours :\ - - asyncio.get_event_loop().run_until_complete( - run_rate_limit_configuration_checks( - endpoint_to_check="http://localhost:10081/", - average=1, - period_sec=60, - burst=10, - ) - ) diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/faker_webserver.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_fake_ports_data.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/faker_webserver.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_fake_ports_data.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_services.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_fake_services_data.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_services.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_fake_services_data.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py similarity index 98% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py index 92e4fb3ada1..062a33d693a 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_login.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_login.py @@ -15,8 +15,8 @@ from simcore_service_webserver.security.api import clean_auth_policy_cache from yarl import URL -from .rawdata_fakers import DEFAULT_FAKER, DEFAULT_TEST_PASSWORD, random_user -from .utils_assert import assert_status +from .assert_checks import assert_status +from .faker_factories import DEFAULT_FAKER, DEFAULT_TEST_PASSWORD, random_user # WARNING: DO NOT use UserDict is already in https://docs.python.org/3/library/collections.html#collections.UserDictclass UserRowDict(TypedDict): diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_webserver_unit_with_db.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_parametrizations.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_webserver_unit_with_db.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_parametrizations.py diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py similarity index 99% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py index 1df38757bbb..63c57e00559 100644 --- a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_projects.py +++ b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py @@ -20,7 +20,7 @@ from simcore_service_webserver.projects.models import ProjectDict from simcore_service_webserver.utils import now_str -from .utils_assert import assert_status +from .assert_checks import assert_status def empty_project_data(): diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/utils_tokens.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_tokens.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/helpers/utils_tokens.py rename to packages/pytest-simcore/src/pytest_simcore/helpers/webserver_tokens.py diff --git a/packages/pytest-simcore/src/pytest_simcore/httpbin_service.py b/packages/pytest-simcore/src/pytest_simcore/httpbin_service.py index 62baba3623e..b6c0a5aad3b 100644 --- a/packages/pytest-simcore/src/pytest_simcore/httpbin_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/httpbin_service.py @@ -21,7 +21,7 @@ from tenacity.stop import stop_after_delay from tenacity.wait import wait_fixed -from .helpers.utils_host import get_localhost_ip +from .helpers.host import get_localhost_ip @pytest.fixture(scope="session") diff --git a/packages/pytest-simcore/src/pytest_simcore/httpx_calls_capture.py b/packages/pytest-simcore/src/pytest_simcore/httpx_calls_capture.py index f2c316fa289..5c8df1ff6c5 100644 --- a/packages/pytest-simcore/src/pytest_simcore/httpx_calls_capture.py +++ b/packages/pytest-simcore/src/pytest_simcore/httpx_calls_capture.py @@ -40,10 +40,10 @@ import yaml from pydantic import parse_obj_as from pytest_mock import MockerFixture, MockType +from pytest_simcore.helpers.docker import get_service_published_port +from pytest_simcore.helpers.host import get_localhost_ip from pytest_simcore.helpers.httpx_client_base_dev import AsyncClientCaptureWrapper -from pytest_simcore.helpers.utils_docker import get_service_published_port -from pytest_simcore.helpers.utils_envs import EnvVarsDict -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from .helpers.httpx_calls_capture_models import ( CreateRespxMockCallback, diff --git a/packages/pytest-simcore/src/pytest_simcore/minio_service.py b/packages/pytest-simcore/src/pytest_simcore/minio_service.py index 0ef03b40e19..46cee6fbeeb 100644 --- a/packages/pytest-simcore/src/pytest_simcore/minio_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/minio_service.py @@ -4,10 +4,10 @@ import pytest from faker import Faker +from pytest_simcore.helpers.docker import get_service_published_port +from pytest_simcore.helpers.host import get_localhost_ip +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_docker import get_service_published_port -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_host import get_localhost_ip from settings_library.s3 import S3Settings diff --git a/packages/pytest-simcore/src/pytest_simcore/monkeypatch_extra.py b/packages/pytest-simcore/src/pytest_simcore/monkeypatch_extra.py deleted file mode 100644 index 3e373216283..00000000000 --- a/packages/pytest-simcore/src/pytest_simcore/monkeypatch_extra.py +++ /dev/null @@ -1,25 +0,0 @@ -# pylint: disable=redefined-outer-name -# pylint: disable=unused-argument -# pylint: disable=unused-variable - -import warnings -from typing import Iterator - -import pytest - -warnings.warn( - f"{__name__} is deprecated, we highly recommend to use pytest.monkeypatch at function-scope level." - "Large scopes lead to complex problems during tests", - DeprecationWarning, -) -# Some extras to overcome https://github.com/pytest-dev/pytest/issues/363 -# SEE https://github.com/pytest-dev/pytest/issues/363#issuecomment-289830794 - - -@pytest.fixture(scope="module") -def monkeypatch_module(request: pytest.FixtureRequest) -> Iterator[pytest.MonkeyPatch]: - assert request.scope == "module" - - mpatch_module = pytest.MonkeyPatch() - yield mpatch_module - mpatch_module.undo() diff --git a/packages/pytest-simcore/src/pytest_simcore/postgres_service.py b/packages/pytest-simcore/src/pytest_simcore/postgres_service.py index a64e21d206c..6e9f06a146a 100644 --- a/packages/pytest-simcore/src/pytest_simcore/postgres_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/postgres_service.py @@ -10,15 +10,15 @@ import pytest import sqlalchemy as sa import tenacity +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 from sqlalchemy.ext.asyncio import AsyncEngine from tenacity.stop import stop_after_delay from tenacity.wait import wait_fixed -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip -from .helpers.utils_postgres import PostgresTestConfig, migrated_pg_tables_context +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip +from .helpers.postgres_tools import PostgresTestConfig, migrated_pg_tables_context _TEMPLATE_DB_TO_RESTORE = "template_simcore_db" diff --git a/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py b/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py index 7856547cc9b..47188400e79 100644 --- a/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/rabbit_service.py @@ -15,9 +15,9 @@ from tenacity.stop import stop_after_attempt from tenacity.wait import wait_fixed +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip from .helpers.typing_env import EnvVarsDict -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip _logger = logging.getLogger(__name__) diff --git a/packages/pytest-simcore/src/pytest_simcore/redis_service.py b/packages/pytest-simcore/src/pytest_simcore/redis_service.py index 9651255198b..3a84f0ceb03 100644 --- a/packages/pytest-simcore/src/pytest_simcore/redis_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/redis_service.py @@ -15,8 +15,8 @@ from tenacity.wait import wait_fixed from yarl import URL -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip log = logging.getLogger(__name__) diff --git a/packages/pytest-simcore/src/pytest_simcore/simcore_dask_service.py b/packages/pytest-simcore/src/pytest_simcore/simcore_dask_service.py index 2fc5220104a..26f16b02a41 100644 --- a/packages/pytest-simcore/src/pytest_simcore/simcore_dask_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/simcore_dask_service.py @@ -12,8 +12,8 @@ from models_library.clusters import InternalClusterAuthentication, TLSAuthentication from pydantic import AnyUrl -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip @pytest.fixture diff --git a/packages/pytest-simcore/src/pytest_simcore/simcore_services.py b/packages/pytest-simcore/src/pytest_simcore/simcore_services.py index 51f278fbde4..cbaa9ee0a32 100644 --- a/packages/pytest-simcore/src/pytest_simcore/simcore_services.py +++ b/packages/pytest-simcore/src/pytest_simcore/simcore_services.py @@ -7,6 +7,7 @@ import logging import warnings from dataclasses import dataclass +from typing import Iterator import aiohttp import pytest @@ -18,9 +19,9 @@ from yarl import URL from .helpers.constants import MINUTE +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip from .helpers.typing_env import EnvVarsDict -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip log = logging.getLogger(__name__) @@ -178,9 +179,28 @@ def simcore_services_ready( monkeypatch.setenv(f"{env_prefix}_PORT", str(endpoint.port)) +@pytest.fixture(scope="module") +def _monkeypatch_module(request: pytest.FixtureRequest) -> Iterator[pytest.MonkeyPatch]: + # WARNING: Temporarily ONLY for simcore_services_ready_module + assert request.scope == "module" + + warnings.warn( + f"{__name__} is deprecated, we highly recommend to use pytest.monkeypatch at function-scope level." + "Large scopes lead to complex problems during tests", + DeprecationWarning, + stacklevel=1, + ) + # Some extras to overcome https://github.com/pytest-dev/pytest/issues/363 + # SEE https://github.com/pytest-dev/pytest/issues/363#issuecomment-289830794 + + mpatch_module = pytest.MonkeyPatch() + yield mpatch_module + mpatch_module.undo() + + @pytest.fixture(scope="module") def simcore_services_ready_module( - services_endpoint: dict[str, URL], monkeypatch_module: pytest.MonkeyPatch + services_endpoint: dict[str, URL], _monkeypatch_module: pytest.MonkeyPatch ) -> None: warnings.warn( "This fixture uses deprecated monkeypatch_module fixture" @@ -195,5 +215,5 @@ def simcore_services_ready_module( assert endpoint.host - monkeypatch_module.setenv(f"{env_prefix}_HOST", endpoint.host) - monkeypatch_module.setenv(f"{env_prefix}_PORT", str(endpoint.port)) + _monkeypatch_module.setenv(f"{env_prefix}_HOST", endpoint.host) + _monkeypatch_module.setenv(f"{env_prefix}_PORT", str(endpoint.port)) diff --git a/packages/pytest-simcore/src/pytest_simcore/simcore_storage_service.py b/packages/pytest-simcore/src/pytest_simcore/simcore_storage_service.py index f5ab4302dd1..9628d1058c9 100644 --- a/packages/pytest-simcore/src/pytest_simcore/simcore_storage_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/simcore_storage_service.py @@ -15,8 +15,8 @@ from servicelib.minio_utils import ServiceRetryPolicyUponInitialization from yarl import URL -from .helpers.utils_docker import get_service_published_port -from .helpers.utils_host import get_localhost_ip +from .helpers.docker import get_service_published_port +from .helpers.host import get_localhost_ip @pytest.fixture(scope="module") diff --git a/packages/pytest-simcore/src/pytest_simcore/simcore_webserver_service.py b/packages/pytest-simcore/src/pytest_simcore/simcore_webserver_service.py index fb1699fabd3..3d5d083edfe 100644 --- a/packages/pytest-simcore/src/pytest_simcore/simcore_webserver_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/simcore_webserver_service.py @@ -9,7 +9,7 @@ from servicelib.minio_utils import ServiceRetryPolicyUponInitialization from yarl import URL -from .helpers.utils_docker import get_service_published_port +from .helpers.docker import get_service_published_port @pytest.fixture(scope="module") diff --git a/packages/pytest-simcore/src/pytest_simcore/pytest_socketio.py b/packages/pytest-simcore/src/pytest_simcore/socketio.py similarity index 100% rename from packages/pytest-simcore/src/pytest_simcore/pytest_socketio.py rename to packages/pytest-simcore/src/pytest_simcore/socketio.py diff --git a/packages/pytest-simcore/src/pytest_simcore/websocket_client.py b/packages/pytest-simcore/src/pytest_simcore/socketio_client.py similarity index 97% rename from packages/pytest-simcore/src/pytest_simcore/websocket_client.py rename to packages/pytest-simcore/src/pytest_simcore/socketio_client.py index eb582b607d3..1dbe8d111b0 100644 --- a/packages/pytest-simcore/src/pytest_simcore/websocket_client.py +++ b/packages/pytest-simcore/src/pytest_simcore/socketio_client.py @@ -9,7 +9,7 @@ import pytest import socketio from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from yarl import URL diff --git a/packages/pytest-simcore/src/pytest_simcore/tmp_path_extra.py b/packages/pytest-simcore/src/pytest_simcore/tmp_path_extra.py deleted file mode 100644 index 7986ead3ad8..00000000000 --- a/packages/pytest-simcore/src/pytest_simcore/tmp_path_extra.py +++ /dev/null @@ -1,25 +0,0 @@ -# pylint: disable=redefined-outer-name -# pylint: disable=unused-argument -# pylint: disable=unused-variable -""" - Extends temp_path fixture - https://docs.pytest.org/en/6.2.x/tmpdir.html#the-tmp-path-fixture - - NOTE: use tmp_path instead of tmpdir - NOTE: default base temporary directory can be set as `pytest --basetemp=mydir` - -""" -from pathlib import Path - -import pytest - - -@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 - ) diff --git a/packages/pytest-simcore/src/pytest_simcore/traefik_service.py b/packages/pytest-simcore/src/pytest_simcore/traefik_service.py index 8bbaf3913be..462dfdb29e2 100644 --- a/packages/pytest-simcore/src/pytest_simcore/traefik_service.py +++ b/packages/pytest-simcore/src/pytest_simcore/traefik_service.py @@ -11,7 +11,7 @@ from servicelib.minio_utils import ServiceRetryPolicyUponInitialization from yarl import URL -from .helpers.utils_docker import get_service_published_port +from .helpers.docker import get_service_published_port @pytest.fixture(scope="module") diff --git a/packages/pytest-simcore/tests/test_helpers_utils_dict.py b/packages/pytest-simcore/tests/test_helpers_utils_dict.py index 524d6a44e30..9fa34442a99 100644 --- a/packages/pytest-simcore/tests/test_helpers_utils_dict.py +++ b/packages/pytest-simcore/tests/test_helpers_utils_dict.py @@ -7,8 +7,8 @@ import sys import pytest +from pytest_simcore.helpers.dict_tools import copy_from_dict, get_from_dict from pytest_simcore.helpers.typing_docker import TaskDict -from pytest_simcore.helpers.utils_dict import copy_from_dict, get_from_dict @pytest.fixture diff --git a/packages/pytest-simcore/tests/test_helpers_utils_envs.py b/packages/pytest-simcore/tests/test_helpers_utils_envs.py index 7117bf99d60..458a72bb063 100644 --- a/packages/pytest-simcore/tests/test_helpers_utils_envs.py +++ b/packages/pytest-simcore/tests/test_helpers_utils_envs.py @@ -1,7 +1,7 @@ from pathlib import Path from textwrap import dedent -from pytest_simcore.helpers.utils_envs import EnvVarsDict, load_dotenv +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, load_dotenv def test_load_envfile(tmp_path: Path): diff --git a/packages/service-integration/tests/conftest.py b/packages/service-integration/tests/conftest.py index 07e4652b2ea..2f148482ea5 100644 --- a/packages/service-integration/tests/conftest.py +++ b/packages/service-integration/tests/conftest.py @@ -14,8 +14,8 @@ pytest_plugins = [ "pytest_simcore.pydantic_models", - "pytest_simcore.repository_paths", "pytest_simcore.pytest_global_environs", + "pytest_simcore.repository_paths", ] _CURRENT_DIR = ( diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py b/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py index 7357f5f1ff9..8e260d81d49 100644 --- a/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py +++ b/packages/service-library/tests/aiohttp/long_running_tasks/conftest.py @@ -10,7 +10,7 @@ from aiohttp.test_utils import TestClient from faker import Faker from pydantic import BaseModel, parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import long_running_tasks, status from servicelib.aiohttp.long_running_tasks.server import TaskId from servicelib.aiohttp.requests_validation import parse_request_query_parameters_as diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py index 255f4fef7fc..b4fda99695e 100644 --- a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py +++ b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks.py @@ -19,7 +19,7 @@ from aiohttp import web from aiohttp.test_utils import TestClient from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import long_running_tasks, status from servicelib.aiohttp.long_running_tasks.server import TaskGet, TaskId from servicelib.aiohttp.rest_middlewares import append_rest_middlewares diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py index c5a72c5645d..4aaca5e8d84 100644 --- a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py +++ b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_client.py @@ -7,7 +7,7 @@ import pytest from aiohttp import ClientResponseError, web from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import long_running_tasks, status from servicelib.aiohttp.long_running_tasks import client as lr_client from servicelib.aiohttp.long_running_tasks.client import ( diff --git a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py index 14eebf23212..941ae31359d 100644 --- a/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py +++ b/packages/service-library/tests/aiohttp/long_running_tasks/test_long_running_tasks_with_task_context.py @@ -19,7 +19,7 @@ from aiohttp import web from aiohttp.test_utils import TestClient from pydantic import create_model, parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import long_running_tasks, status from servicelib.aiohttp.long_running_tasks._server import ( RQT_LONG_RUNNING_TASKS_CONTEXT_KEY, diff --git a/packages/service-library/tests/conftest.py b/packages/service-library/tests/conftest.py index 7329ecee428..81734453cc4 100644 --- a/packages/service-library/tests/conftest.py +++ b/packages/service-library/tests/conftest.py @@ -16,10 +16,10 @@ from settings_library.redis import RedisDatabase, RedisSettings pytest_plugins = [ - "pytest_simcore.container_pause", "pytest_simcore.docker_compose", "pytest_simcore.docker_registry", "pytest_simcore.docker_swarm", + "pytest_simcore.docker", "pytest_simcore.environment_configs", "pytest_simcore.file_extra", "pytest_simcore.pytest_global_environs", @@ -28,7 +28,6 @@ "pytest_simcore.repository_paths", "pytest_simcore.schemas", "pytest_simcore.simcore_service_library_fixtures", - "pytest_simcore.tmp_path_extra", ] diff --git a/packages/service-library/tests/fastapi/test_rabbitmq.py b/packages/service-library/tests/fastapi/test_rabbitmq.py index 2112f2bafdf..9c94cfa0766 100644 --- a/packages/service-library/tests/fastapi/test_rabbitmq.py +++ b/packages/service-library/tests/fastapi/test_rabbitmq.py @@ -12,8 +12,8 @@ from models_library.rabbitmq_messages import LoggerRabbitMessage, RabbitMessageBase from pydantic import ValidationError 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 from servicelib.fastapi.rabbitmq import get_rabbitmq_client, setup_rabbit from servicelib.rabbitmq import BIND_TO_ALL_TOPICS, RabbitMQClient from settings_library.rabbit import RabbitSettings diff --git a/packages/settings-library/src/settings_library/comp_services.py b/packages/settings-library/src/settings_library/comp_services.py index 787882143f5..e3cb628f7b7 100644 --- a/packages/settings-library/src/settings_library/comp_services.py +++ b/packages/settings-library/src/settings_library/comp_services.py @@ -17,14 +17,14 @@ class ComputationalServices(BaseCustomSettings): @validator("DEFAULT_MAX_NANO_CPUS", pre=True) @classmethod - def set_default_cpus_if_negative(cls, v): + def _set_default_cpus_if_negative(cls, v): if v is None or v == "" or int(v) <= 0: v = _DEFAULT_MAX_NANO_CPUS_VALUE return v @validator("DEFAULT_MAX_MEMORY", pre=True) @classmethod - def set_default_memory_if_negative(cls, v): + def _set_default_memory_if_negative(cls, v): if v is None or v == "" or int(v) <= 0: v = _DEFAULT_MAX_MEMORY_VALUE return v diff --git a/packages/settings-library/src/settings_library/docker_registry.py b/packages/settings-library/src/settings_library/docker_registry.py index 3043e46f54a..bb365cb9785 100644 --- a/packages/settings-library/src/settings_library/docker_registry.py +++ b/packages/settings-library/src/settings_library/docker_registry.py @@ -25,7 +25,7 @@ class RegistrySettings(BaseCustomSettings): @validator("REGISTRY_PATH", pre=True) @classmethod - def escape_none_string(cls, v) -> Any | None: + def _escape_none_string(cls, v) -> Any | None: return None if v == "None" else v @cached_property diff --git a/packages/settings-library/src/settings_library/email.py b/packages/settings-library/src/settings_library/email.py index bd5ed0ab261..b15bf209405 100644 --- a/packages/settings-library/src/settings_library/email.py +++ b/packages/settings-library/src/settings_library/email.py @@ -33,7 +33,7 @@ class SMTPSettings(BaseCustomSettings): @root_validator @classmethod - def both_credentials_must_be_set(cls, values): + def _both_credentials_must_be_set(cls, values): username = values.get("SMTP_USERNAME") password = values.get("SMTP_PASSWORD") @@ -45,7 +45,7 @@ def both_credentials_must_be_set(cls, values): @root_validator @classmethod - def enabled_tls_required_authentication(cls, values): + def _enabled_tls_required_authentication(cls, values): smtp_protocol = values.get("SMTP_PROTOCOL") username = values.get("SMTP_USERNAME") diff --git a/packages/settings-library/src/settings_library/node_ports.py b/packages/settings-library/src/settings_library/node_ports.py index f2f3f5cd9aa..2a5d12f1bd7 100644 --- a/packages/settings-library/src/settings_library/node_ports.py +++ b/packages/settings-library/src/settings_library/node_ports.py @@ -21,9 +21,9 @@ def auth_required(self) -> bool: # for details see https://github.com/ITISFoundation/osparc-issues/issues/1264 return self.STORAGE_USERNAME is not None and self.STORAGE_PASSWORD is not None - @classmethod @root_validator - def validate_auth_fields(cls, values): + @classmethod + def _validate_auth_fields(cls, values): username = values["STORAGE_USERNAME"] password = values["STORAGE_PASSWORD"] if (username is None) != (password is None): diff --git a/packages/settings-library/tests/test_application.py b/packages/settings-library/tests/test_application.py index 8447a253a21..8f847e5dd24 100644 --- a/packages/settings-library/tests/test_application.py +++ b/packages/settings-library/tests/test_application.py @@ -5,8 +5,8 @@ import pytest +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 from settings_library.application import BaseApplicationSettings diff --git a/packages/settings-library/tests/test_base.py b/packages/settings-library/tests/test_base.py index f6afeeee093..aa1ffa95a23 100644 --- a/packages/settings-library/tests/test_base.py +++ b/packages/settings-library/tests/test_base.py @@ -14,7 +14,7 @@ from pydantic import BaseModel, BaseSettings, ValidationError from pydantic.fields import Field from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import setenvs_from_envfile +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_envfile from settings_library.base import ( _DEFAULTS_TO_NONE_MSG, BaseCustomSettings, diff --git a/packages/settings-library/tests/test_base_w_postgres.py b/packages/settings-library/tests/test_base_w_postgres.py index 288f121bec4..d54d40bf925 100644 --- a/packages/settings-library/tests/test_base_w_postgres.py +++ b/packages/settings-library/tests/test_base_w_postgres.py @@ -7,7 +7,7 @@ import pytest from pydantic import Field, ValidationError -from pytest_simcore.helpers.utils_envs import setenvs_from_envfile +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_envfile from settings_library.base import BaseCustomSettings, DefaultFromEnvFactoryError from settings_library.basic_types import PortInt diff --git a/packages/settings-library/tests/test_email.py b/packages/settings-library/tests/test_email.py index 449218857c0..1cd3978503e 100644 --- a/packages/settings-library/tests/test_email.py +++ b/packages/settings-library/tests/test_email.py @@ -7,8 +7,8 @@ import pytest from pydantic import ValidationError +from pytest_simcore.helpers.monkeypatch_envs import delenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import delenvs_from_dict from settings_library.email import EmailProtocol, SMTPSettings diff --git a/packages/settings-library/tests/test_node_ports_settings.py b/packages/settings-library/tests/test_node_ports_settings.py index 1ac178a93ef..0adbd4efb4d 100644 --- a/packages/settings-library/tests/test_node_ports_settings.py +++ b/packages/settings-library/tests/test_node_ports_settings.py @@ -1,5 +1,5 @@ import pytest -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from settings_library.node_ports import StorageAuthSettings diff --git a/packages/settings-library/tests/test_twilio.py b/packages/settings-library/tests/test_twilio.py index 0d77ac0bd39..6f2830ea4aa 100644 --- a/packages/settings-library/tests/test_twilio.py +++ b/packages/settings-library/tests/test_twilio.py @@ -3,7 +3,7 @@ # pylint: disable=unused-variable import pytest -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from settings_library.twilio import TwilioSettings diff --git a/packages/settings-library/tests/test_utils_cli.py b/packages/settings-library/tests/test_utils_cli.py index 0e6d5398cf7..665358ea3b4 100644 --- a/packages/settings-library/tests/test_utils_cli.py +++ b/packages/settings-library/tests/test_utils_cli.py @@ -12,8 +12,8 @@ import typer from dotenv import dotenv_values from pydantic import Field, SecretStr +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_envfile from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_envfile from settings_library.base import BaseCustomSettings from settings_library.utils_cli import ( create_json_encoder_wo_secrets, diff --git a/packages/simcore-sdk/tests/conftest.py b/packages/simcore-sdk/tests/conftest.py index 88f9b296442..e5cde2bc51c 100644 --- a/packages/simcore-sdk/tests/conftest.py +++ b/packages/simcore-sdk/tests/conftest.py @@ -10,8 +10,8 @@ import pytest import simcore_sdk +from pytest_simcore.helpers.postgres_tools import PostgresTestConfig from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_postgres import PostgresTestConfig from simcore_sdk.node_ports_common.file_io_utils import LogRedirectCB current_dir = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent @@ -31,7 +31,6 @@ "pytest_simcore.services_api_mocks_for_aiohttp_clients", "pytest_simcore.simcore_services", "pytest_simcore.simcore_storage_service", - "pytest_simcore.tmp_path_extra", ] diff --git a/packages/simcore-sdk/tests/integration/conftest.py b/packages/simcore-sdk/tests/integration/conftest.py index 20510ff7f23..8ced749bcf3 100644 --- a/packages/simcore-sdk/tests/integration/conftest.py +++ b/packages/simcore-sdk/tests/integration/conftest.py @@ -18,7 +18,7 @@ from models_library.projects_nodes_io import LocationID, NodeIDStr, SimcoreS3FileID from models_library.users import UserID from pydantic import parse_obj_as -from pytest_simcore.helpers.rawdata_fakers import random_project, random_user +from pytest_simcore.helpers.faker_factories import random_project, random_user from settings_library.r_clone import RCloneSettings, S3Provider from settings_library.s3 import S3Settings from simcore_postgres_database.models.comp_pipeline import comp_pipeline diff --git a/packages/simcore-sdk/tests/integration/test_node_ports_common_filemanager.py b/packages/simcore-sdk/tests/integration/test_node_ports_common_filemanager.py index bb796481897..67e4bed3c68 100644 --- a/packages/simcore-sdk/tests/integration/test_node_ports_common_filemanager.py +++ b/packages/simcore-sdk/tests/integration/test_node_ports_common_filemanager.py @@ -21,7 +21,7 @@ from models_library.users import UserID from pydantic import ByteSize, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.parametrizations import byte_size_ids from servicelib.progress_bar import ProgressBarData from settings_library.r_clone import RCloneSettings from simcore_sdk.node_ports_common import exceptions, filemanager diff --git a/packages/simcore-sdk/tests/unit/test_node_ports_common_storage_client.py b/packages/simcore-sdk/tests/unit/test_node_ports_common_storage_client.py index ea08391b826..3fb97424daa 100644 --- a/packages/simcore-sdk/tests/unit/test_node_ports_common_storage_client.py +++ b/packages/simcore-sdk/tests/unit/test_node_ports_common_storage_client.py @@ -9,7 +9,7 @@ from aiohttp import ClientResponseError, ClientSession from aiohttp.client_exceptions import ClientConnectionError from aioresponses import aioresponses -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from simcore_sdk.node_ports_common.storage_client import retry_request _ROUTE_ALWAYS_200_OK: Final[str] = "http://always-200-ok" diff --git a/packages/simcore-sdk/tests/unit/test_storage_client.py b/packages/simcore-sdk/tests/unit/test_storage_client.py index 156ef27f847..91e46c5bd61 100644 --- a/packages/simcore-sdk/tests/unit/test_storage_client.py +++ b/packages/simcore-sdk/tests/unit/test_storage_client.py @@ -21,7 +21,7 @@ from models_library.projects_nodes_io import SimcoreS3FileID from models_library.users import UserID from pydantic import AnyUrl, ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.aiohttp import status from simcore_sdk.node_ports_common import exceptions from simcore_sdk.node_ports_common._filemanager import _get_https_link_if_storage_secure diff --git a/services/api-server/tests/conftest.py b/services/api-server/tests/conftest.py index e60cf7f53c4..25180a27491 100644 --- a/services/api-server/tests/conftest.py +++ b/services/api-server/tests/conftest.py @@ -8,7 +8,7 @@ import pytest import simcore_service_api_server from dotenv import dotenv_values -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent @@ -27,7 +27,6 @@ "pytest_simcore.repository_paths", "pytest_simcore.schemas", "pytest_simcore.services_api_mocks_for_aiohttp_clients", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/api-server/tests/unit/_with_db/conftest.py b/services/api-server/tests/unit/_with_db/conftest.py index 783933db3cb..57450561ce4 100644 --- a/services/api-server/tests/unit/_with_db/conftest.py +++ b/services/api-server/tests/unit/_with_db/conftest.py @@ -24,13 +24,13 @@ from models_library.api_schemas_api_server.api_keys import ApiKeyInDB from pydantic import PositiveInt from pytest_mock import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import ( +from pytest_simcore.helpers.faker_factories import ( random_api_key, random_product, random_user, ) +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 from simcore_postgres_database.models.api_keys import api_keys from simcore_postgres_database.models.base import metadata from simcore_postgres_database.models.products import products diff --git a/services/api-server/tests/unit/_with_db/test_core_settings__with_db.py b/services/api-server/tests/unit/_with_db/test_core_settings__with_db.py index 4cb770979f0..f61c1ae4153 100644 --- a/services/api-server/tests/unit/_with_db/test_core_settings__with_db.py +++ b/services/api-server/tests/unit/_with_db/test_core_settings__with_db.py @@ -5,7 +5,7 @@ import logging -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_api_server.core.settings import ApplicationSettings, BootModeEnum from yarl import URL diff --git a/services/api-server/tests/unit/api_studies/conftest.py b/services/api-server/tests/unit/api_studies/conftest.py index 50ec7b18c57..e25d0aedd79 100644 --- a/services/api-server/tests/unit/api_studies/conftest.py +++ b/services/api-server/tests/unit/api_studies/conftest.py @@ -9,7 +9,7 @@ import pytest from faker import Faker -from pytest_simcore.helpers.faker_webserver import ( +from pytest_simcore.helpers.webserver_fake_ports_data import ( PROJECTS_METADATA_PORTS_RESPONSE_BODY_DATA, ) from simcore_service_api_server.models.schemas.studies import StudyID diff --git a/services/api-server/tests/unit/conftest.py b/services/api-server/tests/unit/conftest.py index 7d7017fe1cd..d4ed6f04229 100644 --- a/services/api-server/tests/unit/conftest.py +++ b/services/api-server/tests/unit/conftest.py @@ -38,8 +38,8 @@ from packaging.version import Version from pydantic import EmailStr, HttpUrl, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from pytest_simcore.simcore_webserver_projects_rest_api import GET_PROJECT from requests.auth import HTTPBasicAuth from respx import MockRouter diff --git a/services/api-server/tests/unit/test_core_settings.py b/services/api-server/tests/unit/test_core_settings.py index d95ea6066f6..fbb9f875b65 100644 --- a/services/api-server/tests/unit/test_core_settings.py +++ b/services/api-server/tests/unit/test_core_settings.py @@ -4,7 +4,7 @@ import pytest -from pytest_simcore.helpers.utils_envs import ( +from pytest_simcore.helpers.monkeypatch_envs import ( EnvVarsDict, delenvs_from_dict, setenvs_from_dict, diff --git a/services/api-server/tests/unit/test_services_rabbitmq.py b/services/api-server/tests/unit/test_services_rabbitmq.py index 34c7ae48af0..6f67b3386bd 100644 --- a/services/api-server/tests/unit/test_services_rabbitmq.py +++ b/services/api-server/tests/unit/test_services_rabbitmq.py @@ -28,7 +28,7 @@ from models_library.users import UserID from pydantic import ValidationError from pytest_mock import MockerFixture, MockFixture -from pytest_simcore.helpers.utils_envs import ( +from pytest_simcore.helpers.monkeypatch_envs import ( EnvVarsDict, delenvs_from_dict, setenvs_from_dict, diff --git a/services/autoscaling/tests/unit/conftest.py b/services/autoscaling/tests/unit/conftest.py index 1ae3a3953fc..5a1fb3d1d64 100644 --- a/services/autoscaling/tests/unit/conftest.py +++ b/services/autoscaling/tests/unit/conftest.py @@ -45,8 +45,8 @@ ) from pydantic import ByteSize, PositiveInt, parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from settings_library.rabbit import RabbitSettings from simcore_service_autoscaling.core.application import create_app from simcore_service_autoscaling.core.settings import ( @@ -81,7 +81,6 @@ "pytest_simcore.environment_configs", "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/autoscaling/tests/unit/test_api_health.py b/services/autoscaling/tests/unit/test_api_health.py index 9ac0dccac01..6fa53018e85 100644 --- a/services/autoscaling/tests/unit/test_api_health.py +++ b/services/autoscaling/tests/unit/test_api_health.py @@ -5,7 +5,7 @@ import httpx import pytest from moto.server import ThreadedMotoServer -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_autoscaling.api.health import _StatusGet from starlette import status diff --git a/services/autoscaling/tests/unit/test_core_settings.py b/services/autoscaling/tests/unit/test_core_settings.py index 89c12efc602..f6bdb8cbc9f 100644 --- a/services/autoscaling/tests/unit/test_core_settings.py +++ b/services/autoscaling/tests/unit/test_core_settings.py @@ -8,7 +8,7 @@ import pytest from faker import Faker from pydantic import ValidationError -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_autoscaling.core.settings import ( ApplicationSettings, EC2InstancesSettings, diff --git a/services/autoscaling/tests/unit/test_main.py b/services/autoscaling/tests/unit/test_main.py index 4f899fdb1fb..525748023ec 100644 --- a/services/autoscaling/tests/unit/test_main.py +++ b/services/autoscaling/tests/unit/test_main.py @@ -3,7 +3,7 @@ # pylint:disable=redefined-outer-name -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict def test_main_app(app_environment: EnvVarsDict): diff --git a/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py b/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py index 5ef0f820902..31b18631044 100644 --- a/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py +++ b/services/autoscaling/tests/unit/test_modules_auto_scaling_computational.py @@ -33,7 +33,7 @@ from models_library.rabbitmq_messages import RabbitAutoscalingStatusMessage from pydantic import ByteSize, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_autoscaling.core.settings import ApplicationSettings from simcore_service_autoscaling.models import EC2InstanceData from simcore_service_autoscaling.modules.auto_scaling_core import auto_scale_cluster diff --git a/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py b/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py index e454c9d2c8d..a947fda1026 100644 --- a/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py +++ b/services/autoscaling/tests/unit/test_modules_auto_scaling_dynamic.py @@ -35,7 +35,7 @@ from models_library.rabbitmq_messages import RabbitAutoscalingStatusMessage from pydantic import ByteSize, parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_autoscaling.core.settings import ApplicationSettings from simcore_service_autoscaling.models import AssociatedInstance, Cluster from simcore_service_autoscaling.modules.auto_scaling_core import ( diff --git a/services/autoscaling/tests/unit/test_modules_auto_scaling_task.py b/services/autoscaling/tests/unit/test_modules_auto_scaling_task.py index 8395792d052..a065df08425 100644 --- a/services/autoscaling/tests/unit/test_modules_auto_scaling_task.py +++ b/services/autoscaling/tests/unit/test_modules_auto_scaling_task.py @@ -10,7 +10,7 @@ import pytest from fastapi import FastAPI from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_autoscaling.core.settings import ApplicationSettings _FAST_POLL_INTERVAL = 1 diff --git a/services/autoscaling/tests/unit/test_modules_dask.py b/services/autoscaling/tests/unit/test_modules_dask.py index b6b78fdd7b6..096dca26d2b 100644 --- a/services/autoscaling/tests/unit/test_modules_dask.py +++ b/services/autoscaling/tests/unit/test_modules_dask.py @@ -18,7 +18,7 @@ TLSAuthentication, ) from pydantic import AnyUrl, ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from simcore_service_autoscaling.core.errors import ( DaskNoWorkersError, DaskSchedulerNotFoundError, diff --git a/services/autoscaling/tests/unit/test_utils_auto_scaling_core.py b/services/autoscaling/tests/unit/test_utils_auto_scaling_core.py index 95879b19158..5755024f830 100644 --- a/services/autoscaling/tests/unit/test_utils_auto_scaling_core.py +++ b/services/autoscaling/tests/unit/test_utils_auto_scaling_core.py @@ -17,8 +17,8 @@ from models_library.docker import DockerGenericTag from models_library.generated_models.docker_rest_api import Node as DockerNode from pydantic import parse_obj_as +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 from simcore_service_autoscaling.core.errors import Ec2InvalidDnsNameError from simcore_service_autoscaling.core.settings import ApplicationSettings from simcore_service_autoscaling.models import AssociatedInstance, EC2InstanceData diff --git a/services/autoscaling/tests/unit/test_utils_docker.py b/services/autoscaling/tests/unit/test_utils_docker.py index ecea7297ebd..8012d932872 100644 --- a/services/autoscaling/tests/unit/test_utils_docker.py +++ b/services/autoscaling/tests/unit/test_utils_docker.py @@ -32,7 +32,7 @@ ) from pydantic import ByteSize, parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from servicelib.docker_utils import to_datetime from settings_library.docker_registry import RegistrySettings from simcore_service_autoscaling.core.settings import ApplicationSettings diff --git a/services/catalog/tests/unit/conftest.py b/services/catalog/tests/unit/conftest.py index 7d7ecac82b0..8ab832aa65f 100644 --- a/services/catalog/tests/unit/conftest.py +++ b/services/catalog/tests/unit/conftest.py @@ -13,8 +13,8 @@ import simcore_service_catalog from asgi_lifespan import LifespanManager from fastapi import FastAPI +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 from simcore_service_catalog.core.application import create_app from simcore_service_catalog.core.settings import ApplicationSettings @@ -29,7 +29,6 @@ "pytest_simcore.pydantic_models", "pytest_simcore.pytest_global_environs", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/catalog/tests/unit/test_services_director.py b/services/catalog/tests/unit/test_services_director.py index a6307f2a5fe..a683be39525 100644 --- a/services/catalog/tests/unit/test_services_director.py +++ b/services/catalog/tests/unit/test_services_director.py @@ -10,8 +10,8 @@ import pytest import respx from fastapi import FastAPI +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 from respx.router import MockRouter from simcore_service_catalog.api.dependencies.director import get_director_api from simcore_service_catalog.core.settings import ApplicationSettings diff --git a/services/catalog/tests/unit/with_dbs/conftest.py b/services/catalog/tests/unit/with_dbs/conftest.py index 25c5c038fe7..af5ba8c5580 100644 --- a/services/catalog/tests/unit/with_dbs/conftest.py +++ b/services/catalog/tests/unit/with_dbs/conftest.py @@ -21,12 +21,12 @@ from models_library.users import UserID from pydantic import parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_postgres import ( +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict +from pytest_simcore.helpers.postgres_tools import ( PostgresTestConfig, insert_and_get_row_lifespan, ) +from pytest_simcore.helpers.typing_env import EnvVarsDict from simcore_postgres_database.models.products import products from simcore_postgres_database.models.users import users from simcore_service_catalog.core.settings import ApplicationSettings diff --git a/services/clusters-keeper/tests/unit/conftest.py b/services/clusters-keeper/tests/unit/conftest.py index 533bb74c94b..31d9575a2bd 100644 --- a/services/clusters-keeper/tests/unit/conftest.py +++ b/services/clusters-keeper/tests/unit/conftest.py @@ -23,7 +23,7 @@ from models_library.users import UserID from models_library.wallets import WalletID from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.rabbitmq import RabbitMQRPCClient from settings_library.ec2 import EC2Settings from settings_library.rabbit import RabbitSettings @@ -39,7 +39,7 @@ pytest_plugins = [ "pytest_simcore.aws_ec2_service", "pytest_simcore.aws_server", - "pytest_simcore.container_pause", + "pytest_simcore.docker", "pytest_simcore.dask_scheduler", "pytest_simcore.docker_compose", "pytest_simcore.docker_swarm", @@ -48,7 +48,6 @@ "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", "pytest_simcore.simcore_service_library_fixtures", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/clusters-keeper/tests/unit/test_api_health.py b/services/clusters-keeper/tests/unit/test_api_health.py index dcd67cb4e98..734620afa1b 100644 --- a/services/clusters-keeper/tests/unit/test_api_health.py +++ b/services/clusters-keeper/tests/unit/test_api_health.py @@ -5,7 +5,7 @@ import httpx import pytest from moto.server import ThreadedMotoServer -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_clusters_keeper.api.health import _StatusGet from starlette import status diff --git a/services/clusters-keeper/tests/unit/test_core_settings.py b/services/clusters-keeper/tests/unit/test_core_settings.py index 4e1df0c9e06..7f97afad58b 100644 --- a/services/clusters-keeper/tests/unit/test_core_settings.py +++ b/services/clusters-keeper/tests/unit/test_core_settings.py @@ -9,7 +9,7 @@ import pytest from aws_library.ec2.models import EC2InstanceBootSpecific from pydantic import ValidationError -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_clusters_keeper.core.settings import ApplicationSettings from types_aiobotocore_ec2.literals import InstanceTypeType diff --git a/services/clusters-keeper/tests/unit/test_main.py b/services/clusters-keeper/tests/unit/test_main.py index 4cf5db92500..96d7fb8507d 100644 --- a/services/clusters-keeper/tests/unit/test_main.py +++ b/services/clusters-keeper/tests/unit/test_main.py @@ -3,7 +3,7 @@ # pylint:disable=redefined-outer-name -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict def test_main_app(app_environment: EnvVarsDict): diff --git a/services/clusters-keeper/tests/unit/test_modules_clusters.py b/services/clusters-keeper/tests/unit/test_modules_clusters.py index ea9329d35a8..47a266dbb4d 100644 --- a/services/clusters-keeper/tests/unit/test_modules_clusters.py +++ b/services/clusters-keeper/tests/unit/test_modules_clusters.py @@ -15,7 +15,7 @@ from models_library.users import UserID from models_library.wallets import WalletID from parse import Result, search -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_clusters_keeper._meta import VERSION as APP_VERSION from simcore_service_clusters_keeper.core.errors import Ec2InstanceNotFoundError from simcore_service_clusters_keeper.core.settings import ( diff --git a/services/clusters-keeper/tests/unit/test_modules_clusters_management_core.py b/services/clusters-keeper/tests/unit/test_modules_clusters_management_core.py index 4ece631188f..de92fd8a64d 100644 --- a/services/clusters-keeper/tests/unit/test_modules_clusters_management_core.py +++ b/services/clusters-keeper/tests/unit/test_modules_clusters_management_core.py @@ -17,8 +17,8 @@ from models_library.users import UserID from models_library.wallets import WalletID 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 from simcore_service_clusters_keeper.core.settings import ApplicationSettings from simcore_service_clusters_keeper.modules.clusters import ( cluster_heartbeat, diff --git a/services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py b/services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py index d738a5cc05e..0c9c52eab4c 100644 --- a/services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py +++ b/services/clusters-keeper/tests/unit/test_modules_clusters_management_task.py @@ -10,7 +10,7 @@ import pytest from fastapi import FastAPI from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_clusters_keeper.core.settings import ApplicationSettings _FAST_POLL_INTERVAL = 1 diff --git a/services/clusters-keeper/tests/unit/test_modules_remote_debug.py b/services/clusters-keeper/tests/unit/test_modules_remote_debug.py index 4a676451334..dbb5a91922e 100644 --- a/services/clusters-keeper/tests/unit/test_modules_remote_debug.py +++ b/services/clusters-keeper/tests/unit/test_modules_remote_debug.py @@ -4,8 +4,8 @@ import pytest from fastapi import FastAPI +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 diff --git a/services/clusters-keeper/tests/unit/test_utils_clusters.py b/services/clusters-keeper/tests/unit/test_utils_clusters.py index 206d751bb03..437774a8c17 100644 --- a/services/clusters-keeper/tests/unit/test_utils_clusters.py +++ b/services/clusters-keeper/tests/unit/test_utils_clusters.py @@ -24,7 +24,7 @@ ) from models_library.utils.json_serialization import json_dumps from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_clusters_keeper.core.settings import ApplicationSettings from simcore_service_clusters_keeper.utils.clusters import ( _prepare_environment_variables, diff --git a/services/clusters-keeper/tests/unit/test_utils_ec2.py b/services/clusters-keeper/tests/unit/test_utils_ec2.py index e7d1be224d3..cc466d113ac 100644 --- a/services/clusters-keeper/tests/unit/test_utils_ec2.py +++ b/services/clusters-keeper/tests/unit/test_utils_ec2.py @@ -6,7 +6,7 @@ from faker import Faker from models_library.users import UserID from models_library.wallets import WalletID -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_clusters_keeper.core.settings import ApplicationSettings from simcore_service_clusters_keeper.utils.ec2 import ( _APPLICATION_TAG_KEY, diff --git a/services/dask-sidecar/tests/unit/conftest.py b/services/dask-sidecar/tests/unit/conftest.py index 377b2ad3255..edc92c87969 100644 --- a/services/dask-sidecar/tests/unit/conftest.py +++ b/services/dask-sidecar/tests/unit/conftest.py @@ -22,8 +22,8 @@ from pydantic import AnyUrl, parse_obj_as from pytest_localftpserver.servers import ProcessFTPServer from pytest_mock.plugin 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 from settings_library.s3 import S3Settings from simcore_service_dask_sidecar.file_utils import _s3fs_settings_from_s3_settings from yarl import URL @@ -37,7 +37,6 @@ "pytest_simcore.environment_configs", "pytest_simcore.faker_users_data", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/director-v2/tests/conftest.py b/services/director-v2/tests/conftest.py index 3ea9811f961..eafe6bb15fc 100644 --- a/services/director-v2/tests/conftest.py +++ b/services/director-v2/tests/conftest.py @@ -25,8 +25,11 @@ from models_library.projects import Node, NodesDict from models_library.users import UserID from pytest_mock import MockerFixture +from pytest_simcore.helpers.monkeypatch_envs import ( + setenvs_from_dict, + setenvs_from_envfile, +) from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict, setenvs_from_envfile from simcore_service_director_v2.core.application import init_app from simcore_service_director_v2.core.settings import AppSettings from starlette.testclient import ASGI3App, TestClient @@ -44,7 +47,7 @@ "pytest_simcore.postgres_service", "pytest_simcore.pydantic_models", "pytest_simcore.pytest_global_environs", - "pytest_simcore.pytest_socketio", + "pytest_simcore.socketio", "pytest_simcore.rabbit_service", "pytest_simcore.redis_service", "pytest_simcore.repository_paths", @@ -52,7 +55,6 @@ "pytest_simcore.simcore_dask_service", "pytest_simcore.simcore_services", "pytest_simcore.simcore_storage_service", - "pytest_simcore.tmp_path_extra", ] logger = logging.getLogger(__name__) diff --git a/services/director-v2/tests/integration/01/test_computation_api.py b/services/director-v2/tests/integration/01/test_computation_api.py index 652b9fb6dff..9c510d5f23f 100644 --- a/services/director-v2/tests/integration/01/test_computation_api.py +++ b/services/director-v2/tests/integration/01/test_computation_api.py @@ -28,9 +28,9 @@ from models_library.projects_pipeline import PipelineDetails from models_library.projects_state import RunningState from models_library.users import UserID +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict +from pytest_simcore.helpers.postgres_tools import PostgresTestConfig from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_postgres import PostgresTestConfig from settings_library.rabbit import RabbitSettings from starlette import status from starlette.testclient import TestClient diff --git a/services/director-v2/tests/integration/02/test_dynamic_services_routes.py b/services/director-v2/tests/integration/02/test_dynamic_services_routes.py index 0bdfb73b5c8..ed43a5c4451 100644 --- a/services/director-v2/tests/integration/02/test_dynamic_services_routes.py +++ b/services/director-v2/tests/integration/02/test_dynamic_services_routes.py @@ -26,9 +26,9 @@ ) from models_library.users import UserID from pytest_mock.plugin import MockerFixture +from pytest_simcore.helpers.host import get_localhost_ip +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 -from pytest_simcore.helpers.utils_host import get_localhost_ip from servicelib.common_headers import ( X_DYNAMIC_SIDECAR_REQUEST_DNS, X_DYNAMIC_SIDECAR_REQUEST_SCHEME, diff --git a/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py b/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py index 0d187de43d2..e8a877b3763 100644 --- a/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py +++ b/services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py @@ -48,9 +48,9 @@ from models_library.users import UserID from pydantic import AnyHttpUrl, parse_obj_as from pytest_mock.plugin import MockerFixture +from pytest_simcore.helpers.host import get_localhost_ip +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 -from pytest_simcore.helpers.utils_host import get_localhost_ip from servicelib.fastapi.long_running_tasks.client import ( Client, ProgressMessage, diff --git a/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py b/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py index 759e9fd620e..134b9eaea74 100644 --- a/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py +++ b/services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py @@ -19,9 +19,9 @@ from models_library.services_resources import ServiceResourcesDict from models_library.users import UserID from pytest_mock.plugin import MockerFixture +from pytest_simcore.helpers.host import get_localhost_ip +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 -from pytest_simcore.helpers.utils_host import get_localhost_ip from settings_library.rabbit import RabbitSettings from settings_library.redis import RedisSettings from utils import ( diff --git a/services/director-v2/tests/integration/02/utils.py b/services/director-v2/tests/integration/02/utils.py index 41efb6e84ec..2b388ef552a 100644 --- a/services/director-v2/tests/integration/02/utils.py +++ b/services/director-v2/tests/integration/02/utils.py @@ -21,7 +21,7 @@ ) from models_library.users import UserID from pydantic import PositiveInt, parse_obj_as -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from servicelib.common_headers import ( X_DYNAMIC_SIDECAR_REQUEST_DNS, X_DYNAMIC_SIDECAR_REQUEST_SCHEME, diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py index 2e05c858f79..4001403c684 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs_sidecar.py @@ -5,7 +5,7 @@ from typing import Any, Final import pytest -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from simcore_service_director_v2.core.settings import AppSettings from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData from simcore_service_director_v2.modules.dynamic_sidecar.docker_service_specs.sidecar import ( diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_observer.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_observer.py index 30e419a0cc6..19ba5f72bcf 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_observer.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_observer.py @@ -9,7 +9,7 @@ from faker import Faker from fastapi import FastAPI from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_director_v2.core.settings import AppSettings from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData from simcore_service_director_v2.modules.dynamic_sidecar.api_client import ( diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_core_events.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_core_events.py index 4d41ad966f2..2bd05535e6a 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_core_events.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_core_events.py @@ -11,8 +11,8 @@ from fastapi import FastAPI from pydantic import PositiveFloat, PositiveInt 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 from servicelib.exception_utils import _SKIPS_MESSAGE from servicelib.fastapi.http_client_thin import BaseHttpClientError from simcore_service_director_v2.models.dynamic_services_scheduler import ( diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py index 05fd4e0b280..124b156ff0e 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py @@ -15,8 +15,8 @@ from faker import Faker from fastapi import FastAPI 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 from respx.router import MockRouter from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData from simcore_service_director_v2.modules.dynamic_sidecar.api_client._public import ( diff --git a/services/director-v2/tests/unit/test_modules_notifier.py b/services/director-v2/tests/unit/test_modules_notifier.py index 3a194d98659..46d0879cebc 100644 --- a/services/director-v2/tests/unit/test_modules_notifier.py +++ b/services/director-v2/tests/unit/test_modules_notifier.py @@ -20,7 +20,7 @@ from models_library.wallets import WalletID from pydantic import NonNegativeInt, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.utils import logged_gather from settings_library.rabbit import RabbitSettings from simcore_service_director_v2.core.settings import AppSettings diff --git a/services/director-v2/tests/unit/with_dbs/test_api_route_computations_tasks.py b/services/director-v2/tests/unit/with_dbs/test_api_route_computations_tasks.py index 2c7c77f9156..6f75f43c59f 100644 --- a/services/director-v2/tests/unit/with_dbs/test_api_route_computations_tasks.py +++ b/services/director-v2/tests/unit/with_dbs/test_api_route_computations_tasks.py @@ -22,8 +22,8 @@ from models_library.projects_nodes_io import NodeID from models_library.users import UserID from pydantic import parse_obj_as, parse_raw_as +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 from simcore_service_director_v2.core.settings import AppSettings from simcore_service_director_v2.models.comp_pipelines import CompPipelineAtDB from simcore_service_director_v2.models.comp_tasks import CompTaskAtDB diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_groups_extra_properties.py b/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_groups_extra_properties.py index 0d02d53d69a..31baae6de57 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_groups_extra_properties.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_groups_extra_properties.py @@ -7,8 +7,8 @@ import sqlalchemy as sa from faker import Faker from fastapi import FastAPI +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 from simcore_postgres_database.models.groups import groups from simcore_postgres_database.models.groups_extra_properties import ( groups_extra_properties, diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py b/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py index d23932422a8..3cdc76f4150 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py @@ -10,8 +10,8 @@ from fastapi import FastAPI from models_library.projects import ProjectAtDB from models_library.projects_nodes_io import NodeID +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 from simcore_postgres_database.utils_projects_nodes import ProjectNodesNodeNotFoundError from simcore_service_director_v2.modules.db.repositories.projects import ( ProjectsRepository, diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py index 3ea1cb1cad8..df52d3cb49c 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py @@ -22,7 +22,7 @@ from models_library.projects_nodes_io import NodeID from models_library.services_enums import ServiceState from models_library.users import UserID -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_director_v2.constants import ( DYNAMIC_PROXY_SERVICE_PREFIX, DYNAMIC_SIDECAR_SCHEDULER_DATA_LABEL, diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py index ee5f4a4f15a..ce475fa5555 100644 --- a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py +++ b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_service_specs.py @@ -27,8 +27,8 @@ from models_library.services import RunID, ServiceKeyVersion from models_library.utils.json_serialization import json_dumps from models_library.wallets import WalletInfo +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 from settings_library.s3 import S3Settings from simcore_service_director_v2.core.dynamic_services_settings.scheduler import ( DynamicServicesSchedulerSettings, diff --git a/services/director/tests/conftest.py b/services/director/tests/conftest.py index f4cf8ab6aed..eecb693e0de 100644 --- a/services/director/tests/conftest.py +++ b/services/director/tests/conftest.py @@ -18,7 +18,6 @@ "pytest_simcore.docker_registry", "pytest_simcore.docker_swarm", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", "pytest_simcore.pytest_global_environs", ] diff --git a/services/dynamic-scheduler/tests/conftest.py b/services/dynamic-scheduler/tests/conftest.py index 641e26559b5..ff72140f5ee 100644 --- a/services/dynamic-scheduler/tests/conftest.py +++ b/services/dynamic-scheduler/tests/conftest.py @@ -11,8 +11,8 @@ from asgi_lifespan import LifespanManager from fastapi import FastAPI 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 from simcore_service_dynamic_scheduler.core.application import create_app pytest_plugins = [ @@ -23,7 +23,6 @@ "pytest_simcore.rabbit_service", "pytest_simcore.redis_service", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/dynamic-scheduler/tests/unit/test_cli.py b/services/dynamic-scheduler/tests/unit/test_cli.py index 637c0c124fb..2e812f7e118 100644 --- a/services/dynamic-scheduler/tests/unit/test_cli.py +++ b/services/dynamic-scheduler/tests/unit/test_cli.py @@ -3,8 +3,8 @@ import os import pytest +from pytest_simcore.helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import load_dotenv, setenvs_from_dict from simcore_service_dynamic_scheduler._meta import API_VERSION from simcore_service_dynamic_scheduler.cli import main as cli_main from simcore_service_dynamic_scheduler.core.settings import ApplicationSettings diff --git a/services/dynamic-sidecar/tests/conftest.py b/services/dynamic-sidecar/tests/conftest.py index a88c402442f..24bb48e4a26 100644 --- a/services/dynamic-sidecar/tests/conftest.py +++ b/services/dynamic-sidecar/tests/conftest.py @@ -21,7 +21,7 @@ from models_library.utils.json_serialization import json_dumps from pydantic import parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import ( +from pytest_simcore.helpers.monkeypatch_envs import ( EnvVarsDict, setenvs_from_dict, setenvs_from_envfile, @@ -39,11 +39,10 @@ "pytest_simcore.faker_users_data", "pytest_simcore.minio_service", "pytest_simcore.pytest_global_environs", - "pytest_simcore.pytest_socketio", + "pytest_simcore.socketio", "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", "pytest_simcore.simcore_service_library_fixtures", - "pytest_simcore.tmp_path_extra", ] CURRENT_DIR = Path(sys.argv[0] if __name__ == "__main__" else __file__).resolve().parent diff --git a/services/dynamic-sidecar/tests/integration/conftest.py b/services/dynamic-sidecar/tests/integration/conftest.py index a39368a34c4..8c7e5e79533 100644 --- a/services/dynamic-sidecar/tests/integration/conftest.py +++ b/services/dynamic-sidecar/tests/integration/conftest.py @@ -3,7 +3,7 @@ import pytest import sqlalchemy as sa from models_library.users import UserID -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 users pytest_plugins = [ diff --git a/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py b/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py index 9123679d3e5..5e70b0a6f79 100644 --- a/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py +++ b/services/dynamic-sidecar/tests/integration/test_modules_long_running_tasks.py @@ -25,9 +25,9 @@ from models_library.users import UserID from pydantic import AnyUrl, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import random_project -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_postgres import PostgresTestConfig +from pytest_simcore.helpers.faker_factories import random_project +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.postgres_tools import PostgresTestConfig from servicelib.fastapi.long_running_tasks.server import TaskProgress from servicelib.utils import logged_gather from settings_library.s3 import S3Settings diff --git a/services/dynamic-sidecar/tests/integration/test_modules_user_services_preferences.py b/services/dynamic-sidecar/tests/integration/test_modules_user_services_preferences.py index 462467cb0ad..094b3014404 100644 --- a/services/dynamic-sidecar/tests/integration/test_modules_user_services_preferences.py +++ b/services/dynamic-sidecar/tests/integration/test_modules_user_services_preferences.py @@ -15,8 +15,8 @@ from models_library.services import ServiceKey, ServiceVersion from models_library.users import UserID from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_postgres import PostgresTestConfig +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.postgres_tools import PostgresTestConfig from simcore_service_dynamic_sidecar.core.application import create_app from simcore_service_dynamic_sidecar.modules.user_services_preferences import ( load_user_services_preferences, diff --git a/services/dynamic-sidecar/tests/unit/conftest.py b/services/dynamic-sidecar/tests/unit/conftest.py index 6df34b37c63..b6e590f71eb 100644 --- a/services/dynamic-sidecar/tests/unit/conftest.py +++ b/services/dynamic-sidecar/tests/unit/conftest.py @@ -11,7 +11,7 @@ from aiodocker.volumes import DockerVolume from async_asgi_testclient import TestClient from fastapi import FastAPI -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_dynamic_sidecar.core.application import AppState, create_app from simcore_service_dynamic_sidecar.core.docker_compose_utils import ( docker_compose_down, diff --git a/services/dynamic-sidecar/tests/unit/test__oas_spec.py b/services/dynamic-sidecar/tests/unit/test__oas_spec.py index a25734b30f2..b5fbc3328a4 100644 --- a/services/dynamic-sidecar/tests/unit/test__oas_spec.py +++ b/services/dynamic-sidecar/tests/unit/test__oas_spec.py @@ -7,7 +7,7 @@ import pytest from fastapi import FastAPI -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict @pytest.fixture diff --git a/services/dynamic-sidecar/tests/unit/test_api_containers.py b/services/dynamic-sidecar/tests/unit/test_api_containers.py index 5615e2c1a24..29ca97093c5 100644 --- a/services/dynamic-sidecar/tests/unit/test_api_containers.py +++ b/services/dynamic-sidecar/tests/unit/test_api_containers.py @@ -26,7 +26,7 @@ from models_library.services import ServiceOutput from models_library.services_creation import CreateServiceMetricsAdditionalParams from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.docker_constants import SUFFIX_EGRESS_PROXY_NAME from servicelib.fastapi.long_running_tasks.client import TaskId from simcore_service_dynamic_sidecar._meta import API_VTAG diff --git a/services/dynamic-sidecar/tests/unit/test_api_containers_long_running_tasks.py b/services/dynamic-sidecar/tests/unit/test_api_containers_long_running_tasks.py index 27c1985f0aa..4069eac1fe7 100644 --- a/services/dynamic-sidecar/tests/unit/test_api_containers_long_running_tasks.py +++ b/services/dynamic-sidecar/tests/unit/test_api_containers_long_running_tasks.py @@ -23,7 +23,7 @@ from models_library.services_creation import CreateServiceMetricsAdditionalParams from pydantic import AnyHttpUrl, parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from servicelib.fastapi.long_running_tasks.client import ( Client, TaskClientResultError, diff --git a/services/dynamic-sidecar/tests/unit/test_api_prometheus_metrics.py b/services/dynamic-sidecar/tests/unit/test_api_prometheus_metrics.py index 1d2a7635b58..75bf997142e 100644 --- a/services/dynamic-sidecar/tests/unit/test_api_prometheus_metrics.py +++ b/services/dynamic-sidecar/tests/unit/test_api_prometheus_metrics.py @@ -15,7 +15,7 @@ from models_library.callbacks_mapping import CallbacksMapping from models_library.services_creation import CreateServiceMetricsAdditionalParams from pydantic import AnyHttpUrl, parse_obj_as -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.fastapi.long_running_tasks.client import ( Client, TaskId, diff --git a/services/dynamic-sidecar/tests/unit/test_api_workflow_service_metrics.py b/services/dynamic-sidecar/tests/unit/test_api_workflow_service_metrics.py index 61dcedbf1d7..bfbebda6bf2 100644 --- a/services/dynamic-sidecar/tests/unit/test_api_workflow_service_metrics.py +++ b/services/dynamic-sidecar/tests/unit/test_api_workflow_service_metrics.py @@ -30,7 +30,7 @@ from models_library.services_creation import CreateServiceMetricsAdditionalParams from pydantic import AnyHttpUrl, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.fastapi.long_running_tasks.client import ( Client, TaskClientResultError, diff --git a/services/dynamic-sidecar/tests/unit/test_core_external_dependencies.py b/services/dynamic-sidecar/tests/unit/test_core_external_dependencies.py index 614c0462f93..3de1c0acf6a 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_external_dependencies.py +++ b/services/dynamic-sidecar/tests/unit/test_core_external_dependencies.py @@ -9,7 +9,7 @@ from fastapi import FastAPI from models_library.projects import ProjectID from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_dynamic_sidecar.core.application import create_app from simcore_service_dynamic_sidecar.core.external_dependencies import ( CouldNotReachExternalDependenciesError, diff --git a/services/dynamic-sidecar/tests/unit/test_core_reserved_space.py b/services/dynamic-sidecar/tests/unit/test_core_reserved_space.py index 568cbc9785f..123f21864a0 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_reserved_space.py +++ b/services/dynamic-sidecar/tests/unit/test_core_reserved_space.py @@ -3,7 +3,7 @@ from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_dynamic_sidecar.core.application import create_base_app from simcore_service_dynamic_sidecar.core.reserved_space import ( _RESERVED_DISK_SPACE_NAME, diff --git a/services/dynamic-sidecar/tests/unit/test_core_settings.py b/services/dynamic-sidecar/tests/unit/test_core_settings.py index 0f3b8116ad4..4512abf71d6 100644 --- a/services/dynamic-sidecar/tests/unit/test_core_settings.py +++ b/services/dynamic-sidecar/tests/unit/test_core_settings.py @@ -2,7 +2,7 @@ # pylint: disable=redefined-outer-name import pytest -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from settings_library.utils_service import DEFAULT_AIOHTTP_PORT from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings diff --git a/services/dynamic-sidecar/tests/unit/test_modules_outputs_manager.py b/services/dynamic-sidecar/tests/unit/test_modules_outputs_manager.py index e8ca825986e..40a3db6d3f9 100644 --- a/services/dynamic-sidecar/tests/unit/test_modules_outputs_manager.py +++ b/services/dynamic-sidecar/tests/unit/test_modules_outputs_manager.py @@ -17,7 +17,7 @@ from models_library.services import RunID from pydantic import PositiveFloat from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_sdk.node_ports_common.exceptions import S3TransferError from simcore_sdk.node_ports_common.file_io_utils import LogRedirectCB from simcore_service_dynamic_sidecar.core.settings import ApplicationSettings diff --git a/services/dynamic-sidecar/tests/unit/test_modules_system_monitor__notifier.py b/services/dynamic-sidecar/tests/unit/test_modules_system_monitor__notifier.py index e567fd9553b..73184a1b3cb 100644 --- a/services/dynamic-sidecar/tests/unit/test_modules_system_monitor__notifier.py +++ b/services/dynamic-sidecar/tests/unit/test_modules_system_monitor__notifier.py @@ -23,7 +23,7 @@ from models_library.users import UserID from pydantic import ByteSize, NonNegativeInt, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.utils import logged_gather from settings_library.rabbit import RabbitSettings from simcore_service_dynamic_sidecar.core.application import create_app diff --git a/services/efs-guardian/tests/unit/conftest.py b/services/efs-guardian/tests/unit/conftest.py index 0b974e13645..62e4352e1cc 100644 --- a/services/efs-guardian/tests/unit/conftest.py +++ b/services/efs-guardian/tests/unit/conftest.py @@ -14,7 +14,7 @@ from asgi_lifespan import LifespanManager from fastapi import FastAPI from httpx import ASGITransport -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.rabbitmq import RabbitMQRPCClient from settings_library.rabbit import RabbitSettings from simcore_service_efs_guardian.core.application import create_app @@ -30,7 +30,6 @@ "pytest_simcore.pytest_global_environs", "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", "pytest_simcore.aws_s3_service", "pytest_simcore.aws_server", ] diff --git a/services/efs-guardian/tests/unit/test_api_health.py b/services/efs-guardian/tests/unit/test_api_health.py index 22bc3377a8f..621543e2d80 100644 --- a/services/efs-guardian/tests/unit/test_api_health.py +++ b/services/efs-guardian/tests/unit/test_api_health.py @@ -4,8 +4,8 @@ import httpx import pytest +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 from settings_library.rabbit import RabbitSettings from starlette import status diff --git a/services/efs-guardian/tests/unit/test_core_settings.py b/services/efs-guardian/tests/unit/test_core_settings.py index a3496b381b5..f8fd28355d7 100644 --- a/services/efs-guardian/tests/unit/test_core_settings.py +++ b/services/efs-guardian/tests/unit/test_core_settings.py @@ -3,7 +3,7 @@ # pylint: disable=unused-variable -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from simcore_service_efs_guardian.core.settings import ApplicationSettings diff --git a/services/efs-guardian/tests/unit/test_efs_manager.py b/services/efs-guardian/tests/unit/test_efs_manager.py index ede34e1824c..cd5b9a755a3 100644 --- a/services/efs-guardian/tests/unit/test_efs_manager.py +++ b/services/efs-guardian/tests/unit/test_efs_manager.py @@ -9,8 +9,8 @@ import pytest from faker import Faker from fastapi import FastAPI +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 from servicelib.rabbitmq import RabbitMQRPCClient from servicelib.rabbitmq.rpc_interfaces.efs_guardian import efs_manager from simcore_service_efs_guardian.core.settings import AwsEfsSettings diff --git a/services/efs-guardian/tests/unit/test_main.py b/services/efs-guardian/tests/unit/test_main.py index 475673488be..bbdb41096c8 100644 --- a/services/efs-guardian/tests/unit/test_main.py +++ b/services/efs-guardian/tests/unit/test_main.py @@ -3,7 +3,7 @@ # pylint:disable=redefined-outer-name -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict def test_main_app(app_environment: EnvVarsDict): diff --git a/services/invitations/tests/unit/conftest.py b/services/invitations/tests/unit/conftest.py index 9a533536dc9..1b6ea4ee6e9 100644 --- a/services/invitations/tests/unit/conftest.py +++ b/services/invitations/tests/unit/conftest.py @@ -10,8 +10,8 @@ from cryptography.fernet import Fernet from faker import Faker from models_library.products import ProductName +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 from simcore_service_invitations.services.invitations import InvitationInputs pytest_plugins = [ diff --git a/services/invitations/tests/unit/test_cli.py b/services/invitations/tests/unit/test_cli.py index 11c599019ac..e77247115cf 100644 --- a/services/invitations/tests/unit/test_cli.py +++ b/services/invitations/tests/unit/test_cli.py @@ -8,8 +8,8 @@ import pytest from faker import Faker from models_library.products import ProductName +from pytest_simcore.helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import load_dotenv, setenvs_from_dict from simcore_service_invitations._meta import API_VERSION from simcore_service_invitations.cli import main from simcore_service_invitations.core.settings import ApplicationSettings diff --git a/services/invitations/tests/unit/test_core_settings.py b/services/invitations/tests/unit/test_core_settings.py index ca91b5bd00b..7c68e809eda 100644 --- a/services/invitations/tests/unit/test_core_settings.py +++ b/services/invitations/tests/unit/test_core_settings.py @@ -5,8 +5,8 @@ import pytest +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 from simcore_service_invitations.core.settings import ( ApplicationSettings, MinimalApplicationSettings, diff --git a/services/migration/tests/conftest.py b/services/migration/tests/conftest.py index dd0a28d12c5..2ad21378f67 100644 --- a/services/migration/tests/conftest.py +++ b/services/migration/tests/conftest.py @@ -3,5 +3,4 @@ "pytest_simcore.docker_registry", "pytest_simcore.docker_swarm", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/osparc-gateway-server/tests/integration/conftest.py b/services/osparc-gateway-server/tests/integration/conftest.py index 7ac15707662..cac3d567864 100644 --- a/services/osparc-gateway-server/tests/integration/conftest.py +++ b/services/osparc-gateway-server/tests/integration/conftest.py @@ -19,7 +19,7 @@ OSPARC_SCHEDULER_API_PORT, OSPARC_SCHEDULER_DASHBOARD_PORT, ) -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from tenacity._asyncio import AsyncRetrying from tenacity.wait import wait_fixed diff --git a/services/osparc-gateway-server/tests/integration/test_clusters.py b/services/osparc-gateway-server/tests/integration/test_clusters.py index 0d1306b0b2a..295754cd9a6 100644 --- a/services/osparc-gateway-server/tests/integration/test_clusters.py +++ b/services/osparc-gateway-server/tests/integration/test_clusters.py @@ -9,7 +9,7 @@ from aiodocker import Docker from dask_gateway import Gateway from faker import Faker -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from tenacity._asyncio import AsyncRetrying from tenacity.stop import stop_after_delay from tenacity.wait import wait_fixed diff --git a/services/osparc-gateway-server/tests/integration/test_dask_sidecar.py b/services/osparc-gateway-server/tests/integration/test_dask_sidecar.py index cbf54edb1c0..f506f0554b4 100644 --- a/services/osparc-gateway-server/tests/integration/test_dask_sidecar.py +++ b/services/osparc-gateway-server/tests/integration/test_dask_sidecar.py @@ -8,7 +8,7 @@ import aiodocker import pytest from faker import Faker -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from tenacity._asyncio import AsyncRetrying from tenacity.stop import stop_after_delay from tenacity.wait import wait_fixed diff --git a/services/osparc-gateway-server/tests/integration/test_gateway.py b/services/osparc-gateway-server/tests/integration/test_gateway.py index c1f89ee76e8..7009c12cb5b 100644 --- a/services/osparc-gateway-server/tests/integration/test_gateway.py +++ b/services/osparc-gateway-server/tests/integration/test_gateway.py @@ -7,7 +7,7 @@ from dask_gateway_server.app import DaskGateway from faker import Faker from osparc_gateway_server.backend.osparc import OsparcBackend -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip @pytest.fixture( diff --git a/services/osparc-gateway-server/tests/system/test_deploy.py b/services/osparc-gateway-server/tests/system/test_deploy.py index 79cc1221884..b6145462b89 100644 --- a/services/osparc-gateway-server/tests/system/test_deploy.py +++ b/services/osparc-gateway-server/tests/system/test_deploy.py @@ -12,7 +12,7 @@ import dask_gateway import pytest from faker import Faker -from pytest_simcore.helpers.utils_host import get_localhost_ip +from pytest_simcore.helpers.host import get_localhost_ip from tenacity._asyncio import AsyncRetrying from tenacity.stop import stop_after_delay from tenacity.wait import wait_fixed diff --git a/services/payments/tests/conftest.py b/services/payments/tests/conftest.py index 26092690de9..042ac85f968 100644 --- a/services/payments/tests/conftest.py +++ b/services/payments/tests/conftest.py @@ -11,8 +11,8 @@ from faker import Faker from models_library.users import GroupID from pydantic import parse_obj_as +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 from servicelib.utils_secrets import generate_token_secret_key pytest_plugins = [ @@ -25,10 +25,9 @@ "pytest_simcore.faker_users_data", "pytest_simcore.httpbin_service", "pytest_simcore.postgres_service", - "pytest_simcore.pytest_socketio", + "pytest_simcore.socketio", "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", ] diff --git a/services/payments/tests/unit/api/test__one_time_payment_workflows.py b/services/payments/tests/unit/api/test__one_time_payment_workflows.py index 153ae6d69b4..2052dee31f6 100644 --- a/services/payments/tests/unit/api/test__one_time_payment_workflows.py +++ b/services/payments/tests/unit/api/test__one_time_payment_workflows.py @@ -17,8 +17,8 @@ from models_library.wallets import WalletID from pydantic import EmailStr, parse_obj_as 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 from respx import MockRouter from servicelib.rabbitmq import RabbitMQRPCClient from servicelib.rabbitmq._constants import RPC_REQUEST_DEFAULT_TIMEOUT_S diff --git a/services/payments/tests/unit/api/test__payment_method_workflows.py b/services/payments/tests/unit/api/test__payment_method_workflows.py index 15cedd186d9..5b92bee8b17 100644 --- a/services/payments/tests/unit/api/test__payment_method_workflows.py +++ b/services/payments/tests/unit/api/test__payment_method_workflows.py @@ -18,8 +18,8 @@ from models_library.wallets import WalletID from pydantic import EmailStr, parse_obj_as 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 from respx import MockRouter from servicelib.rabbitmq import RabbitMQRPCClient from servicelib.rabbitmq._constants import RPC_REQUEST_DEFAULT_TIMEOUT_S diff --git a/services/payments/tests/unit/api/test_rest_acknowledgements.py b/services/payments/tests/unit/api/test_rest_acknowledgements.py index 58614a1ac53..4df30829f93 100644 --- a/services/payments/tests/unit/api/test_rest_acknowledgements.py +++ b/services/payments/tests/unit/api/test_rest_acknowledgements.py @@ -16,8 +16,8 @@ PaymentNotFoundError, ) 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 from simcore_service_payments.models.schemas.acknowledgements import ( AckPayment, AckPaymentMethod, diff --git a/services/payments/tests/unit/conftest.py b/services/payments/tests/unit/conftest.py index aeb9c9a446a..63f4ed97bbd 100644 --- a/services/payments/tests/unit/conftest.py +++ b/services/payments/tests/unit/conftest.py @@ -25,7 +25,7 @@ from models_library.wallets import WalletID from pydantic import parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import random_payment_method_view +from pytest_simcore.helpers.faker_factories import random_payment_method_view from pytest_simcore.helpers.typing_env import EnvVarsDict from respx import MockRouter from servicelib.rabbitmq import RabbitMQRPCClient diff --git a/services/payments/tests/unit/test_cli.py b/services/payments/tests/unit/test_cli.py index c0c62c3190c..2d01fd0fc31 100644 --- a/services/payments/tests/unit/test_cli.py +++ b/services/payments/tests/unit/test_cli.py @@ -6,8 +6,8 @@ import os import pytest +from pytest_simcore.helpers.monkeypatch_envs import load_dotenv, setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import load_dotenv, setenvs_from_dict from simcore_service_payments._meta import API_VERSION from simcore_service_payments.cli import main as cli_main from simcore_service_payments.core.settings import ApplicationSettings diff --git a/services/payments/tests/unit/test_db_payments_methods_repo.py b/services/payments/tests/unit/test_db_payments_methods_repo.py index 76166c5d0be..f64570cf598 100644 --- a/services/payments/tests/unit/test_db_payments_methods_repo.py +++ b/services/payments/tests/unit/test_db_payments_methods_repo.py @@ -7,8 +7,8 @@ import pytest from fastapi import FastAPI +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 from simcore_service_payments.db.payments_methods_repo import PaymentsMethodsRepo from simcore_service_payments.models.db import InitPromptAckFlowState, PaymentsMethodsDB diff --git a/services/payments/tests/unit/test_db_payments_transactions_repo.py b/services/payments/tests/unit/test_db_payments_transactions_repo.py index 23bd548446a..62e217a9e7a 100644 --- a/services/payments/tests/unit/test_db_payments_transactions_repo.py +++ b/services/payments/tests/unit/test_db_payments_transactions_repo.py @@ -7,8 +7,8 @@ import pytest from fastapi import FastAPI +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 from simcore_service_payments.db.payments_transactions_repo import ( PaymentsTransactionsRepo, ) diff --git a/services/payments/tests/unit/test_db_payments_users_repo.py b/services/payments/tests/unit/test_db_payments_users_repo.py index 4db76e25992..a695af251c4 100644 --- a/services/payments/tests/unit/test_db_payments_users_repo.py +++ b/services/payments/tests/unit/test_db_payments_users_repo.py @@ -11,9 +11,9 @@ import pytest from fastapi import FastAPI from models_library.users import GroupID, UserID +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict +from pytest_simcore.helpers.postgres_tools import insert_and_get_row_lifespan from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_postgres import insert_and_get_row_lifespan from simcore_postgres_database.models.payments_transactions import payments_transactions from simcore_postgres_database.models.products import products from simcore_postgres_database.models.users import users diff --git a/services/payments/tests/unit/test_rpc_payments.py b/services/payments/tests/unit/test_rpc_payments.py index 96fe89c6bff..3e5b3ad1c2a 100644 --- a/services/payments/tests/unit/test_rpc_payments.py +++ b/services/payments/tests/unit/test_rpc_payments.py @@ -14,8 +14,8 @@ from models_library.payments import UserInvoiceAddress from models_library.rabbitmq_basic_types import RPCMethodName from pydantic import parse_obj_as +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 from respx import MockRouter from servicelib.rabbitmq import RabbitMQRPCClient, RPCServerError from servicelib.rabbitmq._constants import RPC_REQUEST_DEFAULT_TIMEOUT_S diff --git a/services/payments/tests/unit/test_rpc_payments_methods.py b/services/payments/tests/unit/test_rpc_payments_methods.py index 5f27c754b4a..9ecb10d9976 100644 --- a/services/payments/tests/unit/test_rpc_payments_methods.py +++ b/services/payments/tests/unit/test_rpc_payments_methods.py @@ -19,8 +19,8 @@ from models_library.users import UserID from models_library.wallets import WalletID from pydantic import EmailStr, parse_obj_as +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 from respx import MockRouter from servicelib.rabbitmq import RabbitMQRPCClient from servicelib.rabbitmq._constants import RPC_REQUEST_DEFAULT_TIMEOUT_S diff --git a/services/payments/tests/unit/test_services_auto_recharge_listener.py b/services/payments/tests/unit/test_services_auto_recharge_listener.py index a3eb8f7cf8d..9db559e8660 100644 --- a/services/payments/tests/unit/test_services_auto_recharge_listener.py +++ b/services/payments/tests/unit/test_services_auto_recharge_listener.py @@ -24,13 +24,13 @@ from models_library.rabbitmq_messages import WalletCreditsMessage from models_library.users import UserID from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import ( +from pytest_simcore.helpers.faker_factories import ( random_payment_autorecharge, random_payment_method, random_payment_transaction, ) +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 from respx import MockRouter from servicelib.rabbitmq import RabbitMQClient, RabbitMQRPCClient, RPCRouter from simcore_postgres_database.models.payments_autorecharge import payments_autorecharge diff --git a/services/payments/tests/unit/test_services_notifier.py b/services/payments/tests/unit/test_services_notifier.py index 3cdeb7224c2..5aab90f9f0f 100644 --- a/services/payments/tests/unit/test_services_notifier.py +++ b/services/payments/tests/unit/test_services_notifier.py @@ -22,9 +22,9 @@ from models_library.users import GroupID, UserID from pydantic import parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import random_payment_transaction +from pytest_simcore.helpers.faker_factories import random_payment_transaction +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 from settings_library.rabbit import RabbitSettings from simcore_service_payments.models.db import PaymentsTransactionsDB from simcore_service_payments.models.db_to_api import to_payments_api_model diff --git a/services/payments/tests/unit/test_services_notifier_email.py b/services/payments/tests/unit/test_services_notifier_email.py index f7d30007df1..d078d902b1b 100644 --- a/services/payments/tests/unit/test_services_notifier_email.py +++ b/services/payments/tests/unit/test_services_notifier_email.py @@ -15,8 +15,8 @@ from models_library.users import UserID 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 from settings_library.email import SMTPSettings from simcore_postgres_database.models.products import Vendor from simcore_service_payments.db.payment_users_repo import PaymentsUsersRepo diff --git a/services/payments/tests/unit/test_services_payments.py b/services/payments/tests/unit/test_services_payments.py index 881db142aff..94452d9c772 100644 --- a/services/payments/tests/unit/test_services_payments.py +++ b/services/payments/tests/unit/test_services_payments.py @@ -18,8 +18,8 @@ from models_library.wallets import WalletID 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 from respx import MockRouter from simcore_service_payments.db.payments_methods_repo import PaymentsMethodsRepo from simcore_service_payments.db.payments_transactions_repo import ( diff --git a/services/payments/tests/unit/test_services_payments__get_invoice.py b/services/payments/tests/unit/test_services_payments__get_invoice.py index a4dfcdc3352..7a391b22351 100644 --- a/services/payments/tests/unit/test_services_payments__get_invoice.py +++ b/services/payments/tests/unit/test_services_payments__get_invoice.py @@ -18,9 +18,9 @@ from models_library.users import UserID from models_library.wallets import WalletID from pydantic import HttpUrl -from pytest_simcore.helpers.rawdata_fakers import random_payment_transaction +from pytest_simcore.helpers.faker_factories import random_payment_transaction +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 from respx import MockRouter from simcore_postgres_database.models.payments_transactions import ( PaymentTransactionState, diff --git a/services/payments/tests/unit/test_services_payments_gateway.py b/services/payments/tests/unit/test_services_payments_gateway.py index ceb1ec48065..f210d1e7258 100644 --- a/services/payments/tests/unit/test_services_payments_gateway.py +++ b/services/payments/tests/unit/test_services_payments_gateway.py @@ -9,7 +9,7 @@ from faker import Faker from fastapi import FastAPI, status from models_library.payments import UserInvoiceAddress -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from respx import MockRouter from simcore_service_payments.core.settings import ApplicationSettings from simcore_service_payments.models.payments_gateway import ( diff --git a/services/payments/tests/unit/test_services_resource_usage_tracker.py b/services/payments/tests/unit/test_services_resource_usage_tracker.py index 7af987fa4d2..0959f535cc1 100644 --- a/services/payments/tests/unit/test_services_resource_usage_tracker.py +++ b/services/payments/tests/unit/test_services_resource_usage_tracker.py @@ -11,7 +11,7 @@ from asgi_lifespan import LifespanManager from faker import Faker from fastapi import FastAPI -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from respx import MockRouter from simcore_service_payments.core.application import create_app from simcore_service_payments.core.settings import ApplicationSettings diff --git a/services/payments/tests/unit/test_services_stripe.py b/services/payments/tests/unit/test_services_stripe.py index d9c3d982d91..fec78997f53 100644 --- a/services/payments/tests/unit/test_services_stripe.py +++ b/services/payments/tests/unit/test_services_stripe.py @@ -7,7 +7,7 @@ import pytest from fastapi import FastAPI, status from models_library.payments import StripeInvoiceID -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from respx import MockRouter from simcore_service_payments.core.settings import ApplicationSettings from simcore_service_payments.services.stripe import StripeApi, setup_stripe diff --git a/services/resource-usage-tracker/tests/unit/conftest.py b/services/resource-usage-tracker/tests/unit/conftest.py index aeb5f36ec4a..6d70142d5e4 100644 --- a/services/resource-usage-tracker/tests/unit/conftest.py +++ b/services/resource-usage-tracker/tests/unit/conftest.py @@ -20,8 +20,8 @@ from fastapi import FastAPI from fastapi.testclient import TestClient 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 from settings_library.rabbit import RabbitSettings from simcore_service_resource_usage_tracker.core.application import create_app from simcore_service_resource_usage_tracker.core.settings import ApplicationSettings @@ -37,7 +37,6 @@ "pytest_simcore.pytest_global_environs", "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", "pytest_simcore.aws_s3_service", "pytest_simcore.aws_server", ] diff --git a/services/resource-usage-tracker/tests/unit/test_web_main.py b/services/resource-usage-tracker/tests/unit/test_web_main.py index c56231e0c0b..a58f4a6139a 100644 --- a/services/resource-usage-tracker/tests/unit/test_web_main.py +++ b/services/resource-usage-tracker/tests/unit/test_web_main.py @@ -3,7 +3,7 @@ # pylint:disable=redefined-outer-name -from pytest_simcore.helpers.utils_envs import EnvVarsDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict def test_main_app(app_environment: EnvVarsDict): diff --git a/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py b/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py index 3d476e01d6d..a0962022d80 100644 --- a/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py +++ b/services/resource-usage-tracker/tests/unit/with_dbs/conftest.py @@ -19,8 +19,8 @@ RabbitResourceTrackingMessageType, RabbitResourceTrackingStartedMessage, ) +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 from servicelib.rabbitmq import RabbitMQRPCClient from settings_library.rabbit import RabbitSettings from simcore_postgres_database.models.resource_tracker_credit_transactions import ( diff --git a/services/storage/tests/conftest.py b/services/storage/tests/conftest.py index d40e621c305..ec6940b1fb2 100644 --- a/services/storage/tests/conftest.py +++ b/services/storage/tests/conftest.py @@ -41,7 +41,7 @@ from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import ByteSize, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_postgres_database.storage_models import file_meta_data, projects, users from simcore_service_storage.application import create @@ -71,7 +71,6 @@ "pytest_simcore.postgres_service", "pytest_simcore.pytest_global_environs", "pytest_simcore.repository_paths", - "pytest_simcore.tmp_path_extra", "tests.fixtures.data_models", "tests.fixtures.datcore_adapter", ] diff --git a/services/storage/tests/fixtures/data_models.py b/services/storage/tests/fixtures/data_models.py index 9fb00685e84..dc5fbadf9e1 100644 --- a/services/storage/tests/fixtures/data_models.py +++ b/services/storage/tests/fixtures/data_models.py @@ -19,7 +19,7 @@ from models_library.projects_nodes_io import NodeID, SimcoreS3FileID from models_library.users import UserID from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.rawdata_fakers import random_project, random_user +from pytest_simcore.helpers.faker_factories import random_project, random_user from servicelib.utils import logged_gather from simcore_postgres_database.storage_models import projects, users diff --git a/services/storage/tests/unit/conftest.py b/services/storage/tests/unit/conftest.py index 91c7d2cdade..222c9913234 100644 --- a/services/storage/tests/unit/conftest.py +++ b/services/storage/tests/unit/conftest.py @@ -24,7 +24,7 @@ from models_library.users import UserID from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import ByteSize -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_service_storage._meta import API_VTAG from simcore_service_storage.handlers_files import UPLOAD_TASKS_KEY diff --git a/services/storage/tests/unit/test__openapi_specs.py b/services/storage/tests/unit/test__openapi_specs.py index 3d4bc0f3509..8e384e5a0d7 100644 --- a/services/storage/tests/unit/test__openapi_specs.py +++ b/services/storage/tests/unit/test__openapi_specs.py @@ -10,8 +10,8 @@ from aiohttp import web from faker import Faker from openapi_core import Spec as OpenApiSpecs +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 from simcore_service_storage.settings import Settings diff --git a/services/storage/tests/unit/test_dsm_dsmcleaner.py b/services/storage/tests/unit/test_dsm_dsmcleaner.py index 36c6ae7342f..40eac9dba06 100644 --- a/services/storage/tests/unit/test_dsm_dsmcleaner.py +++ b/services/storage/tests/unit/test_dsm_dsmcleaner.py @@ -22,7 +22,7 @@ from models_library.projects_nodes_io import SimcoreS3DirectoryID, SimcoreS3FileID from models_library.users import UserID from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.parametrizations import byte_size_ids from simcore_postgres_database.storage_models import file_meta_data from simcore_service_storage import db_file_meta_data from simcore_service_storage.exceptions import ( diff --git a/services/storage/tests/unit/test_handlers_datasets.py b/services/storage/tests/unit/test_handlers_datasets.py index 3a4dc574bac..52e3c3ed348 100644 --- a/services/storage/tests/unit/test_handlers_datasets.py +++ b/services/storage/tests/unit/test_handlers_datasets.py @@ -17,8 +17,8 @@ from models_library.users import UserID from pydantic import ByteSize, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.parametrizations import byte_size_ids from servicelib.aiohttp import status from tests.helpers.file_utils import parametrized_file_size diff --git a/services/storage/tests/unit/test_handlers_files.py b/services/storage/tests/unit/test_handlers_files.py index ebea214b569..ea966634770 100644 --- a/services/storage/tests/unit/test_handlers_files.py +++ b/services/storage/tests/unit/test_handlers_files.py @@ -44,8 +44,8 @@ from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import AnyHttpUrl, ByteSize, HttpUrl, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.parametrizations import byte_size_ids from servicelib.aiohttp import status from simcore_service_storage.constants import ( MULTIPART_UPLOADS_MIN_TOTAL_SIZE, diff --git a/services/storage/tests/unit/test_handlers_files_metadata.py b/services/storage/tests/unit/test_handlers_files_metadata.py index 87cbfcc1999..55cf83dbcac 100644 --- a/services/storage/tests/unit/test_handlers_files_metadata.py +++ b/services/storage/tests/unit/test_handlers_files_metadata.py @@ -15,7 +15,7 @@ from models_library.projects import ProjectID from models_library.users import UserID from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status pytest_simcore_core_services_selection = ["postgres"] diff --git a/services/storage/tests/unit/test_handlers_health.py b/services/storage/tests/unit/test_handlers_health.py index 1447bd46846..3504575c205 100644 --- a/services/storage/tests/unit/test_handlers_health.py +++ b/services/storage/tests/unit/test_handlers_health.py @@ -8,7 +8,7 @@ from models_library.api_schemas_storage import S3BucketName from models_library.app_diagnostics import AppStatusCheck from moto.server import ThreadedMotoServer -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_service_storage.handlers_health import HealthCheck from simcore_service_storage.s3_client import StorageS3Client diff --git a/services/storage/tests/unit/test_handlers_locations.py b/services/storage/tests/unit/test_handlers_locations.py index c541be0d75e..cc236499ee9 100644 --- a/services/storage/tests/unit/test_handlers_locations.py +++ b/services/storage/tests/unit/test_handlers_locations.py @@ -9,7 +9,7 @@ import pytest from aiohttp.test_utils import TestClient from models_library.users import UserID -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from tests.helpers.utils import has_datcore_tokens diff --git a/services/storage/tests/unit/test_handlers_simcore_s3.py b/services/storage/tests/unit/test_handlers_simcore_s3.py index 348e214d5b5..916f7d3cdba 100644 --- a/services/storage/tests/unit/test_handlers_simcore_s3.py +++ b/services/storage/tests/unit/test_handlers_simcore_s3.py @@ -25,7 +25,7 @@ from models_library.utils.change_case import camel_to_snake from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import ByteSize, parse_file_as, parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.long_running_tasks.client import long_running_task_request from servicelib.utils import logged_gather diff --git a/services/storage/tests/unit/test_s3_client.py b/services/storage/tests/unit/test_s3_client.py index 3d44547f3e1..20dab8581bc 100644 --- a/services/storage/tests/unit/test_s3_client.py +++ b/services/storage/tests/unit/test_s3_client.py @@ -30,7 +30,7 @@ from models_library.projects_nodes_io import SimcoreS3FileID from pydantic import ByteSize, parse_obj_as from pytest_mock import MockFixture -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.parametrizations import byte_size_ids from simcore_service_storage.models import MultiPartUploadLinks, S3BucketName from simcore_service_storage.s3_client import ( StorageS3Client, diff --git a/services/storage/tests/unit/test_s3_utils.py b/services/storage/tests/unit/test_s3_utils.py index 8f159d45790..ddcb866b383 100644 --- a/services/storage/tests/unit/test_s3_utils.py +++ b/services/storage/tests/unit/test_s3_utils.py @@ -6,7 +6,7 @@ import pytest from pydantic import ByteSize, parse_obj_as -from pytest_simcore.helpers.utils_parametrizations import byte_size_ids +from pytest_simcore.helpers.parametrizations import byte_size_ids from simcore_service_storage.s3_utils import ( _MULTIPART_MAX_NUMBER_OF_PARTS, _MULTIPART_UPLOADS_TARGET_MAX_PART_SIZE, diff --git a/services/web/server/tests/conftest.py b/services/web/server/tests/conftest.py index 5415e67e6c6..cd6b0142b33 100644 --- a/services/web/server/tests/conftest.py +++ b/services/web/server/tests/conftest.py @@ -21,10 +21,10 @@ from models_library.projects_nodes_io import NodeID from models_library.projects_state import ProjectState from models_library.utils.json_serialization import json_dumps -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.dict_tools import ConfigDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict from pytest_simcore.simcore_webserver_projects_rest_api import NEW_PROJECT from servicelib.aiohttp import status from servicelib.aiohttp.long_running_tasks.server import TaskStatus @@ -73,8 +73,7 @@ "pytest_simcore.services_api_mocks_for_aiohttp_clients", "pytest_simcore.simcore_service_library_fixtures", "pytest_simcore.simcore_services", - "pytest_simcore.tmp_path_extra", - "pytest_simcore.websocket_client", + "pytest_simcore.socketio_client", ] diff --git a/services/web/server/tests/integration/01/test_exporter_requests_handlers.py b/services/web/server/tests/integration/01/test_exporter_requests_handlers.py index fb5d4d72cc5..d51945ba960 100644 --- a/services/web/server/tests/integration/01/test_exporter_requests_handlers.py +++ b/services/web/server/tests/integration/01/test_exporter_requests_handlers.py @@ -15,8 +15,8 @@ import pytest import redis.asyncio as aioredis from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict -from pytest_simcore.helpers.utils_projects import ( +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.webserver_projects import ( create_project, delete_all_projects, empty_project_data, diff --git a/services/web/server/tests/integration/01/test_garbage_collection.py b/services/web/server/tests/integration/01/test_garbage_collection.py index 6f23eb1ae12..adf3849444d 100644 --- a/services/web/server/tests/integration/01/test_garbage_collection.py +++ b/services/web/server/tests/integration/01/test_garbage_collection.py @@ -22,8 +22,8 @@ from aioresponses import aioresponses from models_library.projects_state import RunningState from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_login import UserInfoDict, log_client_in -from pytest_simcore.helpers.utils_projects import create_project, empty_project_data +from pytest_simcore.helpers.webserver_login import UserInfoDict, log_client_in +from pytest_simcore.helpers.webserver_projects import create_project, empty_project_data from servicelib.aiohttp.application import create_safe_application from settings_library.rabbit import RabbitSettings from settings_library.redis import RedisDatabase, RedisSettings diff --git a/services/web/server/tests/integration/02/conftest.py b/services/web/server/tests/integration/02/conftest.py index 920a7c7abbc..d82d86242cf 100644 --- a/services/web/server/tests/integration/02/conftest.py +++ b/services/web/server/tests/integration/02/conftest.py @@ -9,7 +9,7 @@ import pytest from models_library.projects import ProjectID -from pytest_simcore.helpers.utils_projects import NewProject +from pytest_simcore.helpers.webserver_projects import NewProject @pytest.fixture(scope="session") diff --git a/services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py b/services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py index a26af00fc4c..913656e8638 100644 --- a/services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py +++ b/services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py @@ -31,7 +31,7 @@ from models_library.users import UserID from models_library.utils.fastapi_encoders import jsonable_encoder from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from redis import Redis from servicelib.aiohttp.application import create_safe_application from servicelib.aiohttp.monitor_services import ( diff --git a/services/web/server/tests/integration/02/scicrunch/test_scicrunch__resolver.py b/services/web/server/tests/integration/02/scicrunch/test_scicrunch__resolver.py index 228fb448855..99683e08cff 100644 --- a/services/web/server/tests/integration/02/scicrunch/test_scicrunch__resolver.py +++ b/services/web/server/tests/integration/02/scicrunch/test_scicrunch__resolver.py @@ -6,7 +6,7 @@ import pytest from aiohttp import ClientSession from aiohttp.client import ClientTimeout -from pytest_simcore.helpers.utils_scrunch_citations import ( +from pytest_simcore.helpers.scrunch_citations import ( ANTIBODY_CITATIONS, ORGANISM_CITATIONS, PLAMID_CITATIONS, diff --git a/services/web/server/tests/integration/02/scicrunch/test_scicrunch__rest.py b/services/web/server/tests/integration/02/scicrunch/test_scicrunch__rest.py index 1a30c32bd00..014418a25fb 100644 --- a/services/web/server/tests/integration/02/scicrunch/test_scicrunch__rest.py +++ b/services/web/server/tests/integration/02/scicrunch/test_scicrunch__rest.py @@ -19,10 +19,7 @@ import pytest from aiohttp import ClientResponseError, ClientSession -from pytest_simcore.helpers.utils_scrunch_citations import ( - NOT_TOOL_CITATIONS, - TOOL_CITATIONS, -) +from pytest_simcore.helpers.scrunch_citations import NOT_TOOL_CITATIONS, TOOL_CITATIONS from servicelib.aiohttp import status from simcore_service_webserver.scicrunch._rest import ( ListOfResourceHits, diff --git a/services/web/server/tests/integration/02/test_computation.py b/services/web/server/tests/integration/02/test_computation.py index 360e3f26958..2531d5761f9 100644 --- a/services/web/server/tests/integration/02/test_computation.py +++ b/services/web/server/tests/integration/02/test_computation.py @@ -17,7 +17,7 @@ from aiohttp.test_utils import TestClient from models_library.projects_state import RunningState from models_library.utils.json_serialization import json_dumps -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application from servicelib.status_utils import get_code_display_name diff --git a/services/web/server/tests/integration/conftest.py b/services/web/server/tests/integration/conftest.py index 8ea2ce01377..114c8b65d23 100644 --- a/services/web/server/tests/integration/conftest.py +++ b/services/web/server/tests/integration/conftest.py @@ -25,9 +25,9 @@ import yaml from pytest_mock import MockerFixture from pytest_simcore.helpers import FIXTURE_CONFIG_CORE_SERVICES_SELECTION -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_docker import get_service_published_port -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.dict_tools import ConfigDict +from pytest_simcore.helpers.docker import get_service_published_port +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from simcore_service_webserver.groups.api import ( add_user_in_group, create_user_group, diff --git a/services/web/server/tests/unit/conftest.py b/services/web/server/tests/unit/conftest.py index 80d3ac3a3c0..40dd2bd79b9 100644 --- a/services/web/server/tests/unit/conftest.py +++ b/services/web/server/tests/unit/conftest.py @@ -15,8 +15,8 @@ import pytest import yaml from openapi_core.schema.specs.models import Spec as OpenApiSpecs -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_projects import empty_project_data +from pytest_simcore.helpers.dict_tools import ConfigDict +from pytest_simcore.helpers.webserver_projects import empty_project_data from simcore_service_webserver.rest._utils import ( get_openapi_specs_path, load_openapi_specs, diff --git a/services/web/server/tests/unit/isolated/conftest.py b/services/web/server/tests/unit/isolated/conftest.py index cdf98e21faa..f4436d35fa1 100644 --- a/services/web/server/tests/unit/isolated/conftest.py +++ b/services/web/server/tests/unit/isolated/conftest.py @@ -6,9 +6,9 @@ import pytest from faker import Faker from pytest_mock import MockerFixture +from pytest_simcore.helpers.dict_tools import ConfigDict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict @pytest.fixture diff --git a/services/web/server/tests/unit/isolated/test__configs.py b/services/web/server/tests/unit/isolated/test__configs.py index f8db0c504d6..fe2984f62ae 100644 --- a/services/web/server/tests/unit/isolated/test__configs.py +++ b/services/web/server/tests/unit/isolated/test__configs.py @@ -10,7 +10,7 @@ from typing import Any import pytest -from pytest_simcore.helpers.utils_environs import eval_service_environ +from pytest_simcore.helpers.deprecated_environs import eval_service_environ from servicelib.aiohttp.application_setup import is_setup_function diff --git a/services/web/server/tests/unit/isolated/test_activity.py b/services/web/server/tests/unit/isolated/test_activity.py index 17821d28918..b8d97b92c67 100644 --- a/services/web/server/tests/unit/isolated/test_activity.py +++ b/services/web/server/tests/unit/isolated/test_activity.py @@ -13,7 +13,7 @@ from aiohttp.client_exceptions import ClientConnectionError from aiohttp.test_utils import TestClient from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application from simcore_service_webserver.activity.plugin import setup_activity diff --git a/services/web/server/tests/unit/isolated/test_application_settings.py b/services/web/server/tests/unit/isolated/test_application_settings.py index c97ff2a59b0..66c5a75200e 100644 --- a/services/web/server/tests/unit/isolated/test_application_settings.py +++ b/services/web/server/tests/unit/isolated/test_application_settings.py @@ -9,8 +9,11 @@ from aiohttp import web from models_library.utils.json_serialization import json_dumps from pydantic import HttpUrl, parse_obj_as +from pytest_simcore.helpers.monkeypatch_envs import ( + setenvs_from_dict, + setenvs_from_envfile, +) from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_envs import setenvs_from_dict, setenvs_from_envfile from simcore_service_webserver.application_settings import ( APP_SETTINGS_KEY, ApplicationSettings, diff --git a/services/web/server/tests/unit/isolated/test_application_settings_utils.py b/services/web/server/tests/unit/isolated/test_application_settings_utils.py index 3b06d0e7a7a..f4f0f901199 100644 --- a/services/web/server/tests/unit/isolated/test_application_settings_utils.py +++ b/services/web/server/tests/unit/isolated/test_application_settings_utils.py @@ -1,7 +1,7 @@ from typing import Callable import pytest -from pytest_simcore.helpers.utils_dict import ConfigDict +from pytest_simcore.helpers.dict_tools import ConfigDict from simcore_service_webserver.application_settings import ApplicationSettings from simcore_service_webserver.application_settings_utils import ( convert_to_app_config, diff --git a/services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py b/services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py index dee75fafb55..e70f153e369 100644 --- a/services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py +++ b/services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py @@ -13,7 +13,7 @@ import simcore_service_webserver from aiohttp import web from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application from simcore_service_webserver._constants import APP_SETTINGS_KEY diff --git a/services/web/server/tests/unit/isolated/test_login_settings.py b/services/web/server/tests/unit/isolated/test_login_settings.py index 0fc59f8ad3c..b6872fce92d 100644 --- a/services/web/server/tests/unit/isolated/test_login_settings.py +++ b/services/web/server/tests/unit/isolated/test_login_settings.py @@ -8,7 +8,7 @@ import pytest from models_library.errors import ErrorDict from pydantic import ValidationError -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from settings_library.email import SMTPSettings from simcore_postgres_database.models.products import ProductLoginSettingsDict from simcore_service_webserver.login.settings import ( diff --git a/services/web/server/tests/unit/isolated/test_rest.py b/services/web/server/tests/unit/isolated/test_rest.py index bedb61da1f5..a10592b7757 100644 --- a/services/web/server/tests/unit/isolated/test_rest.py +++ b/services/web/server/tests/unit/isolated/test_rest.py @@ -11,8 +11,8 @@ from aiohttp import web from aiohttp.test_utils import TestClient from pytest_mock import MockerFixture +from pytest_simcore.helpers.assert_checks import assert_status from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application from simcore_service_webserver.application_settings import setup_settings diff --git a/services/web/server/tests/unit/isolated/test_studies_dispatcher_core.py b/services/web/server/tests/unit/isolated/test_studies_dispatcher_core.py index 074c9d2d5e4..8faada91005 100644 --- a/services/web/server/tests/unit/isolated/test_studies_dispatcher_core.py +++ b/services/web/server/tests/unit/isolated/test_studies_dispatcher_core.py @@ -15,7 +15,7 @@ from pydantic import validator from pydantic.main import BaseModel from pydantic.networks import HttpUrl -from pytest_simcore.helpers.utils_services import list_fake_file_consumers +from pytest_simcore.helpers.webserver_fake_services_data import list_fake_file_consumers from simcore_service_webserver.studies_dispatcher._projects import ( UserInfo, ViewerInfo, diff --git a/services/web/server/tests/unit/isolated/test_studies_dispatcher_projects_permalinks.py b/services/web/server/tests/unit/isolated/test_studies_dispatcher_projects_permalinks.py index 62bcde16dca..03a0eb5920f 100644 --- a/services/web/server/tests/unit/isolated/test_studies_dispatcher_projects_permalinks.py +++ b/services/web/server/tests/unit/isolated/test_studies_dispatcher_projects_permalinks.py @@ -11,8 +11,8 @@ from aiohttp import web from aiohttp.test_utils import make_mocked_request from faker import Faker +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 from simcore_service_webserver.application_settings import setup_settings from simcore_service_webserver.studies_dispatcher._projects_permalinks import ( PermalinkNotAllowedError, diff --git a/services/web/server/tests/unit/isolated/test_studies_dispatcher_settings.py b/services/web/server/tests/unit/isolated/test_studies_dispatcher_settings.py index bf3d8a575e6..91364e64beb 100644 --- a/services/web/server/tests/unit/isolated/test_studies_dispatcher_settings.py +++ b/services/web/server/tests/unit/isolated/test_studies_dispatcher_settings.py @@ -10,8 +10,8 @@ import pytest from models_library.errors import ErrorDict from pydantic import ValidationError +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 from simcore_service_webserver.studies_dispatcher.settings import ( StudiesDispatcherSettings, ) diff --git a/services/web/server/tests/unit/with_dbs/01/clusters/test_clusters_handlers.py b/services/web/server/tests/unit/with_dbs/01/clusters/test_clusters_handlers.py index be01e2fd5a7..c3f6b1d8570 100644 --- a/services/web/server/tests/unit/with_dbs/01/clusters/test_clusters_handlers.py +++ b/services/web/server/tests/unit/with_dbs/01/clusters/test_clusters_handlers.py @@ -23,8 +23,8 @@ ) from models_library.clusters import CLUSTER_ADMIN_RIGHTS, Cluster, SimpleAuthentication from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( # nopycln: import +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_parametrizations import ( # nopycln: import ExpectedResponse, standard_role_response, ) diff --git a/services/web/server/tests/unit/with_dbs/01/notifications/test_notifications__db_comp_tasks_listening_task.py b/services/web/server/tests/unit/with_dbs/01/notifications/test_notifications__db_comp_tasks_listening_task.py index ac207d5943f..160b39f4c97 100644 --- a/services/web/server/tests/unit/with_dbs/01/notifications/test_notifications__db_comp_tasks_listening_task.py +++ b/services/web/server/tests/unit/with_dbs/01/notifications/test_notifications__db_comp_tasks_listening_task.py @@ -16,7 +16,7 @@ from faker import Faker from models_library.projects import ProjectAtDB, ProjectID from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp.application_keys import APP_DB_ENGINE_KEY from simcore_postgres_database.models.comp_pipeline import StateType from simcore_postgres_database.models.comp_tasks import NodeClass, comp_tasks diff --git a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/conftest.py b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/conftest.py index 09001ddc27b..d80957cca89 100644 --- a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/conftest.py +++ b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/conftest.py @@ -8,8 +8,8 @@ import pytest 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 from simcore_service_webserver.log import setup_logging from simcore_service_webserver.studies_dispatcher.settings import ( StudiesDispatcherSettings, diff --git a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_handlers.py b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_handlers.py index a7fecb40dcd..8157dc8248a 100644 --- a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_handlers.py +++ b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_handlers.py @@ -20,8 +20,8 @@ from models_library.utils.json_serialization import json_dumps from pydantic import BaseModel, ByteSize, parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict, UserRole +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict, UserRole from pytest_simcore.pydantic_models import iter_model_examples_in_module from servicelib.aiohttp import status from settings_library.redis import RedisSettings diff --git a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_projects.py b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_projects.py index b89e1a0f224..48aacf56c6c 100644 --- a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_projects.py +++ b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_projects.py @@ -14,9 +14,9 @@ from models_library.projects import Project, ProjectID from models_library.projects_nodes_io import NodeID from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_login import NewUser -from pytest_simcore.helpers.utils_projects import delete_all_projects -from pytest_simcore.helpers.utils_services import list_fake_file_consumers +from pytest_simcore.helpers.webserver_fake_services_data import list_fake_file_consumers +from pytest_simcore.helpers.webserver_login import NewUser +from pytest_simcore.helpers.webserver_projects import delete_all_projects from simcore_service_webserver.groups.api import auto_add_user_to_groups from simcore_service_webserver.projects.projects_api import get_project_for_user from simcore_service_webserver.studies_dispatcher._models import ServiceInfo diff --git a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_studies_access.py b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_studies_access.py index 1abf8926a57..6291f766b56 100644 --- a/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_studies_access.py +++ b/services/web/server/tests/unit/with_dbs/01/studies_dispatcher/test_studies_dispatcher_studies_access.py @@ -21,10 +21,10 @@ from models_library.projects_state import ProjectLocked, ProjectStatus from pytest_mock import MockerFixture from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict, UserRole -from pytest_simcore.helpers.utils_projects import NewProject, delete_all_projects -from pytest_simcore.helpers.utils_webserver_unit_with_db import MockedStorageSubsystem +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict, UserRole +from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects from servicelib.aiohttp import status from servicelib.aiohttp.long_running_tasks.client import LRTask from servicelib.aiohttp.long_running_tasks.server import TaskProgress diff --git a/services/web/server/tests/unit/with_dbs/01/test_api_keys.py b/services/web/server/tests/unit/with_dbs/01/test_api_keys.py index 4a19bf8ebe9..aa9e1a14065 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_api_keys.py +++ b/services/web/server/tests/unit/with_dbs/01/test_api_keys.py @@ -11,8 +11,8 @@ import pytest from aiohttp.test_utils import TestClient from models_library.products import ProductName -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver.api_keys._api import ( get_api_key, diff --git a/services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py b/services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py index b70812f09ae..7ad51c739d7 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py +++ b/services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py @@ -14,9 +14,9 @@ from models_library.rabbitmq_basic_types import RPCMethodName from pydantic import parse_obj_as 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 -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.rabbitmq import RabbitMQRPCClient from settings_library.rabbit import RabbitSettings from simcore_postgres_database.models.users import UserRole diff --git a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__pricing_plan.py b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__pricing_plan.py index b6a8f9bd82b..b328ddc4c7d 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__pricing_plan.py +++ b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__pricing_plan.py @@ -15,8 +15,8 @@ from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import parse_obj_as from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py index 8d5ac4100fa..933e2bf54f8 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py +++ b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py @@ -10,10 +10,10 @@ from models_library.api_schemas_webserver.catalog import DEVServiceGet from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import parse_obj_as +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services_resources.py b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services_resources.py index 3d9cc977658..afffca3652a 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services_resources.py +++ b/services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services_resources.py @@ -15,8 +15,8 @@ ) from pydantic import parse_obj_as from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from settings_library.catalog import CatalogSettings from simcore_service_webserver.catalog.settings import get_plugin_settings diff --git a/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py b/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py index cc6b4b7ece4..8cbcfbdf739 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py +++ b/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py @@ -7,9 +7,9 @@ from aiohttp.test_utils import TestClient from faker import Faker from models_library.projects import ProjectID -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) diff --git a/services/web/server/tests/unit/with_dbs/01/test_groups.py b/services/web/server/tests/unit/with_dbs/01/test_groups.py index 0403e5e303b..f6e41225ff7 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_groups.py +++ b/services/web/server/tests/unit/with_dbs/01/test_groups.py @@ -13,9 +13,9 @@ import pytest from aiohttp.test_utils import TestClient from faker import Faker -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, NewUser, UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, NewUser, UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) diff --git a/services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py b/services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py index 5caecca99f5..2f79fb3c402 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py +++ b/services/web/server/tests/unit/with_dbs/01/test_groups_handlers_classifers.py @@ -8,7 +8,7 @@ import pytest from aiohttp import web_exceptions from aioresponses.core import aioresponses -from pytest_simcore.helpers.utils_dict import ConfigDict +from pytest_simcore.helpers.dict_tools import ConfigDict @pytest.fixture diff --git a/services/web/server/tests/unit/with_dbs/01/test_long_running_tasks.py b/services/web/server/tests/unit/with_dbs/01/test_long_running_tasks.py index 4c5e3c108ab..4e3f10a9c4d 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_long_running_tasks.py +++ b/services/web/server/tests/unit/with_dbs/01/test_long_running_tasks.py @@ -7,8 +7,8 @@ import pytest from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) diff --git a/services/web/server/tests/unit/with_dbs/01/test_resource_manager_user_sessions.py b/services/web/server/tests/unit/with_dbs/01/test_resource_manager_user_sessions.py index 79d88422c58..403dfbc6a2e 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_resource_manager_user_sessions.py +++ b/services/web/server/tests/unit/with_dbs/01/test_resource_manager_user_sessions.py @@ -12,7 +12,7 @@ import pytest import redis.asyncio as aioredis from aiohttp import web -from pytest_simcore.helpers.utils_envs import setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from servicelib.aiohttp.application import create_safe_application from servicelib.aiohttp.application_setup import is_setup_completed from simcore_service_webserver.application_settings import setup_settings diff --git a/services/web/server/tests/unit/with_dbs/01/test_storage.py b/services/web/server/tests/unit/with_dbs/01/test_storage.py index 1d645083aac..e6977b67c6d 100644 --- a/services/web/server/tests/unit/with_dbs/01/test_storage.py +++ b/services/web/server/tests/unit/with_dbs/01/test_storage.py @@ -7,7 +7,7 @@ import pytest from aiohttp import web from faker import Faker -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application from simcore_postgres_database.models.users import UserRole diff --git a/services/web/server/tests/unit/with_dbs/02/conftest.py b/services/web/server/tests/unit/with_dbs/02/conftest.py index 7a311221770..4e776efc341 100644 --- a/services/web/server/tests/unit/with_dbs/02/conftest.py +++ b/services/web/server/tests/unit/with_dbs/02/conftest.py @@ -26,11 +26,11 @@ ) from pydantic import parse_obj_as from pytest_mock import MockerFixture +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_projects import NewProject, delete_all_projects +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects from settings_library.catalog import CatalogSettings from simcore_service_webserver.application_settings import get_application_settings from simcore_service_webserver.catalog.settings import get_plugin_settings diff --git a/services/web/server/tests/unit/with_dbs/02/test_announcements.py b/services/web/server/tests/unit/with_dbs/02/test_announcements.py index a6a33c3ad62..cd87e2526c6 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_announcements.py +++ b/services/web/server/tests/unit/with_dbs/02/test_announcements.py @@ -17,9 +17,9 @@ from aiohttp.test_utils import TestClient from faker import Faker from pydantic import BaseModel, ValidationError +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict from pytest_simcore.pydantic_models import iter_model_examples_in_module from servicelib.aiohttp import status from settings_library.redis import RedisDatabase, RedisSettings diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_cancellations.py b/services/web/server/tests/unit/with_dbs/02/test_projects_cancellations.py index abe8611bf69..832bceb1f77 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_cancellations.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_cancellations.py @@ -10,10 +10,10 @@ import pytest from aiohttp.test_utils import TestClient from pydantic import ByteSize, parse_obj_as +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, MockedStorageSubsystem, standard_role_response, diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py index b4a29386231..23b654dc684 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py @@ -11,8 +11,8 @@ import pytest import sqlalchemy as sa from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.projects import projects from simcore_service_webserver._meta import api_version_prefix diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py index 38f638692c5..482a4ced098 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py @@ -24,9 +24,9 @@ from models_library.services import ServiceKey from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, MockedStorageSubsystem, standard_role_response, diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__clone.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__clone.py index 6215ae57226..be67e5c5bc9 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__clone.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__clone.py @@ -15,8 +15,8 @@ from models_library.api_schemas_webserver.projects import ProjectGet from models_library.projects import ProjectID from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem from servicelib.aiohttp.long_running_tasks.client import long_running_task_request from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.projects.models import ProjectDict diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py index f54537a6d0e..b177bcc16e0 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__delete.py @@ -21,9 +21,9 @@ ) from models_library.projects import ProjectID from models_library.projects_state import ProjectStatus -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, MockedStorageSubsystem, standard_role_response, diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list.py index 57c8317ebda..dae689d1974 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list.py @@ -12,8 +12,8 @@ import pytest from aiohttp.test_utils import TestClient from aioresponses import aioresponses -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py index 77fefa326f8..b0a23fb420e 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__list_with_query_params.py @@ -17,11 +17,11 @@ from models_library.users import UserID from pydantic import BaseModel, PositiveInt from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_projects import create_project -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) +from pytest_simcore.helpers.webserver_projects import create_project from simcore_service_webserver._meta import api_version_prefix from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.projects.models import ProjectDict diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__patch.py b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__patch.py index 756f60184a8..f522bc91f46 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__patch.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers__patch.py @@ -12,8 +12,8 @@ import pytest from aiohttp.test_utils import TestClient from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver._meta import api_version_prefix from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py index 66e9f97a534..7a7056d7bbc 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_metadata_handlers.py @@ -19,9 +19,9 @@ from models_library.projects import ProjectID from models_library.projects_nodes_io import NodeID from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, MockedStorageSubsystem, standard_user_role_response, diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py index 9ceec731870..806115ed971 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py @@ -34,9 +34,9 @@ ) from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import NonNegativeFloat, NonNegativeInt, parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, MockedStorageSubsystem, standard_role_response, diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py index 1706d21f688..7136a86e837 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py @@ -12,8 +12,8 @@ import pytest from aiohttp.test_utils import TestClient from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver._meta import api_version_prefix from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__services_access.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__services_access.py index 869f3b78b5c..44188b708e5 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__services_access.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__services_access.py @@ -14,7 +14,7 @@ ServiceAccessRightsGet, ) from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.projects.models import ProjectDict diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_pricing_unit_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_pricing_unit_handlers.py index 1a3e2ba3862..5806a4bbfe3 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_pricing_unit_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_pricing_unit_handlers.py @@ -21,8 +21,8 @@ from pydantic import parse_obj_as from pytest_mock.plugin import MockerFixture from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict from servicelib.aiohttp import status from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings from simcore_service_webserver._meta import api_version_prefix diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_ports_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_ports_handlers.py index b7e25ee3393..ae1b62e0558 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_ports_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_ports_handlers.py @@ -16,12 +16,12 @@ from models_library.api_schemas_webserver.projects import ProjectGet from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import parse_obj_as -from pytest_simcore.helpers.faker_webserver import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_fake_ports_data import ( PROJECTS_METADATA_PORTS_RESPONSE_BODY_DATA, ) -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_webserver_unit_with_db import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem from servicelib.aiohttp import status from servicelib.aiohttp.long_running_tasks.client import long_running_task_request from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py index d95fb1313e1..8613fbc8319 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py @@ -41,14 +41,14 @@ ServiceResourcesDictHelpers, ) from models_library.utils.fastapi_encoders import jsonable_encoder +from pytest_simcore.helpers.assert_checks import assert_status from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict, log_client_in -from pytest_simcore.helpers.utils_projects import assert_get_same_project -from pytest_simcore.helpers.utils_webserver_unit_with_db import ( +from pytest_simcore.helpers.webserver_login import UserInfoDict, log_client_in +from pytest_simcore.helpers.webserver_parametrizations import ( ExpectedResponse, standard_role_response, ) +from pytest_simcore.helpers.webserver_projects import assert_get_same_project from servicelib.aiohttp import status from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE from simcore_postgres_database.models.products import products diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_wallet_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_wallet_handlers.py index 432eaff4e2c..4fdf9a88e42 100644 --- a/services/web/server/tests/unit/with_dbs/02/test_projects_wallet_handlers.py +++ b/services/web/server/tests/unit/with_dbs/02/test_projects_wallet_handlers.py @@ -13,8 +13,8 @@ from aiohttp.test_utils import TestClient from models_library.api_schemas_webserver.wallets import WalletGet from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.wallets import wallets from simcore_service_webserver._meta import api_version_prefix diff --git a/services/web/server/tests/unit/with_dbs/03/conftest.py b/services/web/server/tests/unit/with_dbs/03/conftest.py index 851d48865a7..ec215a41e79 100644 --- a/services/web/server/tests/unit/with_dbs/03/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/conftest.py @@ -14,7 +14,7 @@ from aiopg.sa.connection import SAConnection from faker import Faker from models_library.products import ProductName -from pytest_simcore.helpers.rawdata_fakers import random_product +from pytest_simcore.helpers.faker_factories import random_product from simcore_postgres_database.models.products import products from simcore_postgres_database.models.products_prices import products_prices from simcore_postgres_database.models.user_preferences import user_preferences_frontend diff --git a/services/web/server/tests/unit/with_dbs/03/garbage_collector/test_resource_manager.py b/services/web/server/tests/unit/with_dbs/03/garbage_collector/test_resource_manager.py index 27ad5fe04f5..2fe84ed67aa 100644 --- a/services/web/server/tests/unit/with_dbs/03/garbage_collector/test_resource_manager.py +++ b/services/web/server/tests/unit/with_dbs/03/garbage_collector/test_resource_manager.py @@ -25,11 +25,11 @@ ) from models_library.utils.fastapi_encoders import jsonable_encoder from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_projects import NewProject -from pytest_simcore.helpers.utils_webserver_unit_with_db import MockedStorageSubsystem +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_projects import NewProject from redis.asyncio import Redis from servicelib.aiohttp import status from servicelib.aiohttp.application import create_safe_application diff --git a/services/web/server/tests/unit/with_dbs/03/invitations/conftest.py b/services/web/server/tests/unit/with_dbs/03/invitations/conftest.py index 018e10fb9f1..84350848be5 100644 --- a/services/web/server/tests/unit/with_dbs/03/invitations/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/invitations/conftest.py @@ -22,7 +22,7 @@ ) from models_library.utils.fastapi_encoders import jsonable_encoder from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from servicelib.aiohttp import status from simcore_service_webserver.application_settings import ApplicationSettings from simcore_service_webserver.invitations.settings import ( diff --git a/services/web/server/tests/unit/with_dbs/03/invitations/test_invitations.py b/services/web/server/tests/unit/with_dbs/03/invitations/test_invitations.py index 49822276e43..ad31dda87c3 100644 --- a/services/web/server/tests/unit/with_dbs/03/invitations/test_invitations.py +++ b/services/web/server/tests/unit/with_dbs/03/invitations/test_invitations.py @@ -9,7 +9,7 @@ from models_library.api_schemas_invitations.invitations import ApiInvitationContent from pytest_mock import MockerFixture from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_login import NewUser +from pytest_simcore.helpers.webserver_login import NewUser from simcore_service_webserver.groups.api import auto_add_user_to_product_group from simcore_service_webserver.invitations._client import ( InvitationsServiceApi, @@ -95,7 +95,7 @@ async def test_invalid_invitation_if_guest_is_already_registered_in_product( # user exists, and we skip product registration to do this test mocker.patch( - "pytest_simcore.helpers.utils_login.auto_add_user_to_product_group", + "pytest_simcore.helpers.webserver_login.auto_add_user_to_product_group", return_value=f"Mocked in {__file__}. SKIPPED auto_add_user_to_product_group", autospec=True, ) diff --git a/services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py b/services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py index 23caa38c36a..7fa3ee144a7 100644 --- a/services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py +++ b/services/web/server/tests/unit/with_dbs/03/invitations/test_login_handlers_registration_invitations.py @@ -14,7 +14,7 @@ from pydantic import HttpUrl from pytest_mock import MockerFixture from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from servicelib.rest_constants import X_PRODUCT_NAME_HEADER from simcore_service_webserver.invitations.api import generate_invitation diff --git a/services/web/server/tests/unit/with_dbs/03/invitations/test_products__invitations_handlers.py b/services/web/server/tests/unit/with_dbs/03/invitations/test_products__invitations_handlers.py index 822437e99d9..c3246184dd0 100644 --- a/services/web/server/tests/unit/with_dbs/03/invitations/test_products__invitations_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/invitations/test_products__invitations_handlers.py @@ -17,9 +17,9 @@ ) from pydantic import PositiveInt from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.rawdata_fakers import DEFAULT_TEST_PASSWORD -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.faker_factories import DEFAULT_TEST_PASSWORD +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.users import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/login/conftest.py b/services/web/server/tests/unit/with_dbs/03/login/conftest.py index 2cb46dfd091..167315facb4 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/login/conftest.py @@ -11,8 +11,8 @@ from aiohttp.test_utils import TestClient from faker import Faker from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from simcore_postgres_database.models.users import users from simcore_postgres_database.models.wallets import wallets from simcore_service_webserver.login.settings import LoginOptions, get_plugin_options diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa.py index b21fb08c594..d6dc34bcdfe 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa.py @@ -14,9 +14,9 @@ from faker import Faker from models_library.authentification import TwoFactorAuthentificationMethod from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewUser, parse_link, parse_test_marks +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewUser, parse_link, parse_test_marks from servicelib.aiohttp import status from servicelib.utils_secrets import generate_passcode from simcore_postgres_database.models.products import ProductLoginSettingsDict, products diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa_resend.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa_resend.py index 19845ef83af..7139811a6b1 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa_resend.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_2fa_resend.py @@ -8,9 +8,9 @@ from aiohttp.test_utils import TestClient from pydantic import parse_obj_as from pytest_mock import MockFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.products import ProductLoginSettingsDict, products from simcore_service_webserver.application_settings import ApplicationSettings diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py index 7785c186acd..c73020d0638 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_auth.py @@ -10,8 +10,8 @@ from aiohttp.test_utils import TestClient from cryptography import fernet from faker import Faker -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import NewUser +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import NewUser from servicelib.aiohttp import status from settings_library.utils_session import DEFAULT_SESSION_COOKIE_NAME from simcore_service_webserver._constants import APP_SETTINGS_KEY diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py index 14adbcefbae..77b6bbd0b0e 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_email.py @@ -4,8 +4,8 @@ import pytest from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, NewUser, parse_link +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, NewUser, parse_link from servicelib.aiohttp import status from simcore_service_webserver._constants import INDEX_RESOURCE_NAME from simcore_service_webserver.login._constants import ( diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py index adba9c7cecf..41f90807925 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_change_password.py @@ -5,8 +5,8 @@ import pytest from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser from servicelib.aiohttp import status from servicelib.aiohttp.rest_responses import unwrap_envelope from simcore_service_webserver.login._constants import ( diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_logout.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_logout.py index 31d4362a88a..910a7cb0b1b 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_logout.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_logout.py @@ -3,8 +3,8 @@ # pylint: disable=unused-variable from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser from servicelib.aiohttp import status from simcore_service_webserver.login.storage import AsyncpgStorage diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py index bb0af10d859..61ade5ec24b 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration.py @@ -11,9 +11,9 @@ from faker import Faker from models_library.products import ProductName from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_error, assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewInvitation, NewUser, parse_link +from pytest_simcore.helpers.assert_checks import assert_error, assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewInvitation, NewUser, parse_link from servicelib.aiohttp import status from servicelib.aiohttp.rest_responses import unwrap_envelope from simcore_service_webserver.db.models import UserStatus diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py index 9ae32c0bf99..8e076f89513 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_registration_handlers.py @@ -13,8 +13,8 @@ from faker import Faker from models_library.api_schemas_webserver.auth import AccountRequestInfo from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.users import UserRole from simcore_service_webserver.login._constants import MSG_USER_DELETED diff --git a/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py b/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py index 3d208e92c51..dd4a49a698a 100644 --- a/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py +++ b/services/web/server/tests/unit/with_dbs/03/login/test_login_reset_password.py @@ -7,8 +7,8 @@ import pytest from aiohttp.test_utils import TestClient, TestServer -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import NewUser, parse_link, parse_test_marks +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import NewUser, parse_link, parse_test_marks from servicelib.aiohttp import status from servicelib.utils_secrets import generate_password from simcore_service_webserver.db.models import ConfirmationAction, UserStatus diff --git a/services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py b/services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py index f36e7ce7447..05bd373b15f 100644 --- a/services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py +++ b/services/web/server/tests/unit/with_dbs/03/meta_modeling/test_meta_modeling_iterations.py @@ -13,9 +13,9 @@ from models_library.services_resources import ServiceResourcesDict from models_library.utils.json_serialization import json_dumps from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict from pytest_simcore.simcore_webserver_projects_rest_api import ( NEW_PROJECT, REPLACE_PROJECT_ON_MODIFIED, diff --git a/services/web/server/tests/unit/with_dbs/03/products/conftest.py b/services/web/server/tests/unit/with_dbs/03/products/conftest.py index 7650497aaf9..99f086477a5 100644 --- a/services/web/server/tests/unit/with_dbs/03/products/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/products/conftest.py @@ -4,8 +4,8 @@ import pytest +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 diff --git a/services/web/server/tests/unit/with_dbs/03/products/test_products_handlers.py b/services/web/server/tests/unit/with_dbs/03/products/test_products_handlers.py index 95698dbe66b..a36fc493ad6 100644 --- a/services/web/server/tests/unit/with_dbs/03/products/test_products_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/products/test_products_handlers.py @@ -12,8 +12,8 @@ from aiohttp.test_utils import TestClient from models_library.api_schemas_webserver.product import GetProduct from models_library.products import ProductName -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from servicelib.rest_constants import X_PRODUCT_NAME_HEADER from simcore_postgres_database.constants import QUANTIZE_EXP_ARG diff --git a/services/web/server/tests/unit/with_dbs/03/products/test_products_rpc.py b/services/web/server/tests/unit/with_dbs/03/products/test_products_rpc.py index 0c513ccabef..3de1f7a95c8 100644 --- a/services/web/server/tests/unit/with_dbs/03/products/test_products_rpc.py +++ b/services/web/server/tests/unit/with_dbs/03/products/test_products_rpc.py @@ -12,9 +12,9 @@ from models_library.rabbitmq_basic_types import RPCMethodName from pydantic import parse_obj_as 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 -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.rabbitmq import RabbitMQRPCClient, RPCServerError from settings_library.rabbit import RabbitSettings from simcore_postgres_database.models.users import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/resource_usage/conftest.py b/services/web/server/tests/unit/with_dbs/03/resource_usage/conftest.py index a763db35434..4dc9da94974 100644 --- a/services/web/server/tests/unit/with_dbs/03/resource_usage/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/resource_usage/conftest.py @@ -4,8 +4,8 @@ import pytest +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 API_VERSION = "v0" RESOURCE_NAME = "projects" diff --git a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py index e5f38cc05d8..6e67883e357 100644 --- a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py +++ b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_admin_pricing_plans.py @@ -19,8 +19,8 @@ from models_library.resource_tracker import PricingPlanClassification from pydantic import parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py index ddf02b2aded..7b25e33a799 100644 --- a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py +++ b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_pricing_plans.py @@ -17,8 +17,8 @@ from models_library.utils.fastapi_encoders import jsonable_encoder from pydantic import parse_obj_as from pytest_simcore.aioresponses_mocker import AioResponsesMock -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__export.py b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__export.py index bc1fabfe5ab..6a80bccca0d 100644 --- a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__export.py +++ b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__export.py @@ -18,7 +18,7 @@ from models_library.rest_ordering import OrderBy from pydantic import AnyUrl, parse_obj_as from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.wallets import wallets from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__list.py b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__list.py index e5fe848543b..33b9d9146f5 100644 --- a/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__list.py +++ b/services/web/server/tests/unit/with_dbs/03/resource_usage/test_usage_services__list.py @@ -18,8 +18,8 @@ ServiceRunPage, ) from pytest_mock.plugin import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.wallets import wallets from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/tags/conftest.py b/services/web/server/tests/unit/with_dbs/03/tags/conftest.py index 4bef4fa16c9..11708b59922 100644 --- a/services/web/server/tests/unit/with_dbs/03/tags/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/tags/conftest.py @@ -8,7 +8,7 @@ import pytest from aioresponses import aioresponses -from pytest_simcore.helpers.utils_projects import NewProject, delete_all_projects +from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects from servicelib.aiohttp.application import create_safe_application from simcore_service_webserver.application_settings import setup_settings from simcore_service_webserver.db.plugin import setup_db diff --git a/services/web/server/tests/unit/with_dbs/03/tags/test_tags.py b/services/web/server/tests/unit/with_dbs/03/tags/test_tags.py index 926b982f55e..84c6647a4c5 100644 --- a/services/web/server/tests/unit/with_dbs/03/tags/test_tags.py +++ b/services/web/server/tests/unit/with_dbs/03/tags/test_tags.py @@ -20,10 +20,10 @@ RunningState, ) from models_library.utils.fastapi_encoders import jsonable_encoder -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_projects import assert_get_same_project -from pytest_simcore.helpers.utils_tags import create_tag, delete_tag +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.postgres_tags import create_tag, delete_tag +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_projects import assert_get_same_project from servicelib.aiohttp import status from simcore_postgres_database.models.tags import tags from simcore_service_webserver.db.models import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py b/services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py index 2b4ad41b803..ebd268074ab 100644 --- a/services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py +++ b/services/web/server/tests/unit/with_dbs/03/test__openapi_specs.py @@ -9,8 +9,8 @@ from aiohttp import web from faker import Faker from openapi_core.schema.specs.models import Spec as OpenApiSpecs +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 from simcore_service_webserver.application import create_application from simcore_service_webserver.application_settings import get_application_settings diff --git a/services/web/server/tests/unit/with_dbs/03/test_email.py b/services/web/server/tests/unit/with_dbs/03/test_email.py index 619ce8d309c..bb1ef162001 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_email.py +++ b/services/web/server/tests/unit/with_dbs/03/test_email.py @@ -18,10 +18,10 @@ from faker import Faker from pydantic import ValidationError from pytest_mock import MockerFixture +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict, UserRole +from pytest_simcore.helpers.webserver_login import UserInfoDict, UserRole from servicelib.aiohttp import status from settings_library.email import EmailProtocol, SMTPSettings from simcore_service_webserver._meta import API_VTAG diff --git a/services/web/server/tests/unit/with_dbs/03/test_project_db.py b/services/web/server/tests/unit/with_dbs/03/test_project_db.py index ebf46bee580..f5586f08561 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_project_db.py +++ b/services/web/server/tests/unit/with_dbs/03/test_project_db.py @@ -20,10 +20,10 @@ from models_library.projects import ProjectID from models_library.projects_nodes_io import NodeID, NodeIDStr from psycopg2.errors import UniqueViolation +from pytest_simcore.helpers.dict_tools import copy_from_dict_ex +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_dict import copy_from_dict_ex -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict, log_client_in +from pytest_simcore.helpers.webserver_login import UserInfoDict, log_client_in from servicelib.utils import logged_gather from simcore_postgres_database.models.projects import ProjectType, projects from simcore_postgres_database.models.projects_to_products import projects_to_products diff --git a/services/web/server/tests/unit/with_dbs/03/test_session.py b/services/web/server/tests/unit/with_dbs/03/test_session.py index 86e590d6441..3d92c32acd2 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_session.py +++ b/services/web/server/tests/unit/with_dbs/03/test_session.py @@ -13,9 +13,9 @@ from aiohttp.test_utils import TestClient from aiohttp_session.cookie_storage import EncryptedCookieStorage from cryptography.fernet import Fernet +from pytest_simcore.helpers.dict_tools import ConfigDict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_login import NewUser +from pytest_simcore.helpers.webserver_login import NewUser from simcore_service_webserver.application import create_application from simcore_service_webserver.session.api import get_session from simcore_service_webserver.session.settings import SessionSettings diff --git a/services/web/server/tests/unit/with_dbs/03/test_socketio.py b/services/web/server/tests/unit/with_dbs/03/test_socketio.py index 8beab6a5619..05be09f7749 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_socketio.py +++ b/services/web/server/tests/unit/with_dbs/03/test_socketio.py @@ -7,10 +7,10 @@ import socketio from aiohttp.test_utils import TestClient, TestServer from pytest_mock import MockerFixture +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.users import UserRole from simcore_service_webserver.application_settings import ApplicationSettings diff --git a/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py b/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py index 5031c483b60..b047fd2c9a7 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/test_storage_handlers.py @@ -16,9 +16,9 @@ ) from pydantic import AnyUrl, ByteSize, parse_obj_as 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 -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp.rest_responses import wrap_as_envelope from simcore_postgres_database.models.users import UserRole diff --git a/services/web/server/tests/unit/with_dbs/03/test_users.py b/services/web/server/tests/unit/with_dbs/03/test_users.py index 4139eaa4ed5..dac6f6696c4 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users.py @@ -20,13 +20,13 @@ from models_library.api_schemas_webserver.auth import AccountRequestInfo from models_library.generics import Envelope from psycopg2 import OperationalError -from pytest_simcore.helpers.rawdata_fakers import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.faker_factories import ( DEFAULT_TEST_PASSWORD, random_pre_registration_details, ) -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from servicelib.rest_constants import RESPONSE_MODEL_POLICY from simcore_postgres_database.models.users import UserRole, UserStatus diff --git a/services/web/server/tests/unit/with_dbs/03/test_users__notifications.py b/services/web/server/tests/unit/with_dbs/03/test_users__notifications.py index f359a0c2f49..77aaccade51 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users__notifications.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users__notifications.py @@ -19,9 +19,9 @@ from aiohttp.test_utils import TestClient from models_library.products import ProductName from pydantic import parse_obj_as -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.users import UserRole from simcore_service_webserver.redis import get_redis_user_notifications_client @@ -92,14 +92,11 @@ async def _create_notifications( redis_client: aioredis.Redis, logged_user: UserInfoDict, product_name: ProductName, - count: int + count: int, ) -> AsyncIterator[list[UserNotification]]: user_notifications: list[UserNotification] = [ - _create_notification( - logged_user=logged_user, - product_name=product_name - ) + _create_notification(logged_user=logged_user, product_name=product_name) for _ in range(count) ] @@ -312,7 +309,7 @@ async def test_create_user_notification_per_product( logged_user=logged_user, product_name="s4l", count=n_notifications_per_product, - ) as _ + ) as _, ): user_id = logged_user["id"] diff --git a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_api.py b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_api.py index f52cc497e7c..3835883af8b 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_api.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_api.py @@ -17,8 +17,8 @@ from models_library.users import UserID from pydantic import BaseModel from pydantic.fields import ModelField -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewUser +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewUser from simcore_postgres_database.models.groups_extra_properties import ( groups_extra_properties, ) diff --git a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_handlers.py b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_handlers.py index be8773b7cd6..73910d7a2c1 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_handlers.py @@ -13,9 +13,9 @@ from faker import Faker from models_library.user_preferences import FrontendUserPreference, PreferenceIdentifier from models_library.users import UserID -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.users import UserRole, UserStatus from simcore_service_webserver.users._preferences_models import ALL_FRONTEND_PREFERENCES diff --git a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_models.py b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_models.py index e049bffad1b..bdfe1af8d81 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users__preferences_models.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users__preferences_models.py @@ -13,7 +13,7 @@ PreferenceIdentifier, PreferenceName, ) -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict from simcore_service_webserver._constants import APP_SETTINGS_KEY from simcore_service_webserver.application_settings import ApplicationSettings from simcore_service_webserver.users._preferences_models import ( diff --git a/services/web/server/tests/unit/with_dbs/03/test_users__tokens.py b/services/web/server/tests/unit/with_dbs/03/test_users__tokens.py index a2cbc2a7486..315f4884bc0 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users__tokens.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users__tokens.py @@ -13,10 +13,10 @@ import pytest from aiohttp.test_utils import TestClient from faker import Faker -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_tokens import ( +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_tokens import ( create_token_in_db, delete_all_tokens_from_db, get_token_from_db, diff --git a/services/web/server/tests/unit/with_dbs/03/test_users_api.py b/services/web/server/tests/unit/with_dbs/03/test_users_api.py index 5fa3d77ab20..28b70592ce8 100644 --- a/services/web/server/tests/unit/with_dbs/03/test_users_api.py +++ b/services/web/server/tests/unit/with_dbs/03/test_users_api.py @@ -7,9 +7,9 @@ import pytest from aiohttp.test_utils import TestClient from faker import Faker -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_envs import EnvVarsDict, setenvs_from_dict -from pytest_simcore.helpers.utils_login import NewUser +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict, setenvs_from_dict +from pytest_simcore.helpers.webserver_login import NewUser from servicelib.aiohttp import status from servicelib.aiohttp.application_keys import APP_DB_ENGINE_KEY from simcore_postgres_database.models.users import UserStatus diff --git a/services/web/server/tests/unit/with_dbs/03/version_control/conftest.py b/services/web/server/tests/unit/with_dbs/03/version_control/conftest.py index 3419d4ac281..634f1d7ca74 100644 --- a/services/web/server/tests/unit/with_dbs/03/version_control/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/version_control/conftest.py @@ -3,9 +3,10 @@ # pylint: disable=unused-variable import logging +from collections.abc import AsyncIterator, Awaitable, Callable from copy import deepcopy from pathlib import Path -from typing import Any, AsyncIterator, Awaitable, Callable +from typing import Any from unittest import mock from uuid import UUID @@ -19,9 +20,9 @@ from models_library.users import UserID from models_library.utils.fastapi_encoders import jsonable_encoder from pytest_mock import MockerFixture -from pytest_simcore.helpers.rawdata_fakers import random_project -from pytest_simcore.helpers.utils_login import UserInfoDict -from pytest_simcore.helpers.utils_projects import NewProject +from pytest_simcore.helpers.faker_factories import random_project +from pytest_simcore.helpers.webserver_login import UserInfoDict +from pytest_simcore.helpers.webserver_projects import NewProject from servicelib.aiohttp import status from simcore_postgres_database.models.projects_version_control import ( projects_vc_repos, diff --git a/services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py b/services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py index ad2d74ced1c..05ab31ccdf8 100644 --- a/services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py +++ b/services/web/server/tests/unit/with_dbs/03/version_control/test_version_control_handlers.py @@ -13,7 +13,7 @@ from models_library.rest_pagination import Page from models_library.users import UserID from pydantic.main import BaseModel -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_service_webserver._meta import API_VTAG as VX from simcore_service_webserver.projects.models import ProjectDict diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/conftest.py b/services/web/server/tests/unit/with_dbs/03/wallets/conftest.py index 25c73d9f005..b5717c5998a 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/conftest.py @@ -10,9 +10,9 @@ import pytest import sqlalchemy as sa from aioresponses import aioresponses +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 -from pytest_simcore.helpers.utils_projects import NewProject, delete_all_projects +from pytest_simcore.helpers.webserver_projects import NewProject, delete_all_projects from simcore_postgres_database.models.wallets import wallets from simcore_service_webserver.application_settings import ApplicationSettings diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/payments/conftest.py b/services/web/server/tests/unit/with_dbs/03/wallets/payments/conftest.py index a675dbaecb8..2b59b77c3b5 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/payments/conftest.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/payments/conftest.py @@ -30,8 +30,8 @@ from models_library.wallets import WalletID from pydantic import EmailStr, HttpUrl from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.payments_transactions import payments_transactions from simcore_postgres_database.models.users_details import ( diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments.py b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments.py index c87de0b0273..ed8b2868481 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments.py @@ -19,8 +19,8 @@ from models_library.rest_pagination import Page from pydantic import parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, NewUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, NewUser, UserInfoDict from servicelib.aiohttp import status from simcore_postgres_database.models.payments_transactions import ( PaymentTransactionState, diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_methods.py b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_methods.py index eed6244b26a..0980e45caa2 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_methods.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_methods.py @@ -24,7 +24,7 @@ from models_library.wallets import WalletID from pydantic import parse_obj_as from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status +from pytest_simcore.helpers.assert_checks import assert_status from servicelib.aiohttp import status from simcore_postgres_database.models.payments_methods import InitPromptAckFlowState from simcore_service_webserver.payments._methods_api import ( diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_rpc.py b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_rpc.py index b512e19b60f..756c008adba 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_rpc.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/payments/test_payments_rpc.py @@ -13,9 +13,9 @@ from models_library.payments import InvoiceDataGet from models_library.rabbitmq_basic_types import RPCMethodName from pydantic import parse_obj_as +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 -from pytest_simcore.helpers.utils_login import UserInfoDict +from pytest_simcore.helpers.webserver_login import UserInfoDict from servicelib.rabbitmq import RabbitMQRPCClient from settings_library.rabbit import RabbitSettings from simcore_service_webserver.application_settings import ApplicationSettings diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets.py b/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets.py index 22918c65753..b5ddcaf6f31 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets.py @@ -23,8 +23,8 @@ ) from models_library.products import ProductName from pytest_mock import MockerFixture -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import LoggedUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import LoggedUser, UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.login.utils import notify_user_confirmation diff --git a/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets_groups.py b/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets_groups.py index 2264838643c..cf47474daaa 100644 --- a/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets_groups.py +++ b/services/web/server/tests/unit/with_dbs/03/wallets/test_wallets_groups.py @@ -9,8 +9,8 @@ import pytest from aiohttp.test_utils import TestClient -from pytest_simcore.helpers.utils_assert import assert_status -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict +from pytest_simcore.helpers.assert_checks import assert_status +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict from servicelib.aiohttp import status from simcore_service_webserver.db.models import UserRole from simcore_service_webserver.projects.models import ProjectDict diff --git a/services/web/server/tests/unit/with_dbs/conftest.py b/services/web/server/tests/unit/with_dbs/conftest.py index b42d20f62e1..c4b5807d58f 100644 --- a/services/web/server/tests/unit/with_dbs/conftest.py +++ b/services/web/server/tests/unit/with_dbs/conftest.py @@ -40,11 +40,11 @@ from models_library.services_enums import ServiceState from pydantic import ByteSize, parse_obj_as from pytest_mock import MockerFixture +from pytest_simcore.helpers.dict_tools import ConfigDict from pytest_simcore.helpers.typing_env import EnvVarsDict -from pytest_simcore.helpers.utils_dict import ConfigDict -from pytest_simcore.helpers.utils_login import NewUser, UserInfoDict -from pytest_simcore.helpers.utils_projects import NewProject -from pytest_simcore.helpers.utils_webserver_unit_with_db import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_login import NewUser, UserInfoDict +from pytest_simcore.helpers.webserver_parametrizations import MockedStorageSubsystem +from pytest_simcore.helpers.webserver_projects import NewProject from redis import Redis from servicelib.aiohttp.application_keys import APP_DB_ENGINE_KEY from servicelib.aiohttp.long_running_tasks.client import LRTask diff --git a/tests/e2e-playwright/tests/conftest.py b/tests/e2e-playwright/tests/conftest.py index afee65541f5..a278ba9166f 100644 --- a/tests/e2e-playwright/tests/conftest.py +++ b/tests/e2e-playwright/tests/conftest.py @@ -22,8 +22,8 @@ from playwright.sync_api._generated import Playwright from pydantic import AnyUrl, TypeAdapter from pytest import Item -from pytest_simcore.logging_utils import log_context -from pytest_simcore.playwright_utils import ( +from pytest_simcore.helpers.logging import log_context +from pytest_simcore.helpers.playwright import ( MINUTE, AutoRegisteredUser, RunningState, diff --git a/tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py b/tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py index f5fc42baff7..7a56b89e594 100644 --- a/tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py +++ b/tests/e2e-playwright/tests/jupyterlabs/test_jupyterlab.py @@ -14,8 +14,8 @@ from playwright.sync_api import Page, WebSocket from pydantic import ByteSize -from pytest_simcore.logging_utils import log_context -from pytest_simcore.playwright_utils import MINUTE, SECOND, ServiceType +from pytest_simcore.helpers.logging import log_context +from pytest_simcore.helpers.playwright import MINUTE, SECOND, ServiceType _WAITING_FOR_SERVICE_TO_START: Final[int] = ( 10 * MINUTE diff --git a/tests/e2e-playwright/tests/resource_usage_tracker/test_resource_usage_tracker.py b/tests/e2e-playwright/tests/resource_usage_tracker/test_resource_usage_tracker.py index d09ad5880ae..88092c91bb6 100644 --- a/tests/e2e-playwright/tests/resource_usage_tracker/test_resource_usage_tracker.py +++ b/tests/e2e-playwright/tests/resource_usage_tracker/test_resource_usage_tracker.py @@ -14,7 +14,7 @@ import pytest from playwright.sync_api import APIRequestContext from pydantic import AnyUrl -from pytest_simcore.logging_utils import test_logger +from pytest_simcore.helpers.logging import test_logger from tenacity import Retrying from tenacity.retry import retry_if_exception_type from tenacity.stop import stop_after_delay diff --git a/tests/e2e-playwright/tests/sim4life/test_sim4life.py b/tests/e2e-playwright/tests/sim4life/test_sim4life.py index 7a27a771466..d60ec45d083 100644 --- a/tests/e2e-playwright/tests/sim4life/test_sim4life.py +++ b/tests/e2e-playwright/tests/sim4life/test_sim4life.py @@ -13,8 +13,8 @@ from playwright.sync_api import APIRequestContext, Page from pydantic import AnyUrl -from pytest_simcore.logging_utils import test_logger -from pytest_simcore.playwright_utils import on_web_socket_default_handler +from pytest_simcore.helpers.logging import test_logger +from pytest_simcore.helpers.playwright import on_web_socket_default_handler from tenacity import Retrying from tenacity.retry import retry_if_exception_type from tenacity.stop import stop_after_attempt diff --git a/tests/e2e-playwright/tests/sleepers/test_sleepers.py b/tests/e2e-playwright/tests/sleepers/test_sleepers.py index fb85309eb72..4e7ac4d3756 100644 --- a/tests/e2e-playwright/tests/sleepers/test_sleepers.py +++ b/tests/e2e-playwright/tests/sleepers/test_sleepers.py @@ -17,8 +17,8 @@ from packaging.version import Version from packaging.version import parse as parse_version from playwright.sync_api import Page, WebSocket -from pytest_simcore.logging_utils import ContextMessages, log_context, test_logger -from pytest_simcore.playwright_utils import ( +from pytest_simcore.helpers.logging import ContextMessages, log_context, test_logger +from pytest_simcore.helpers.playwright import ( MINUTE, RunningState, ServiceType, diff --git a/tests/e2e-playwright/tests/tip/conftest.py b/tests/e2e-playwright/tests/tip/conftest.py index f7e3b928520..a9e48ff45b4 100644 --- a/tests/e2e-playwright/tests/tip/conftest.py +++ b/tests/e2e-playwright/tests/tip/conftest.py @@ -5,8 +5,8 @@ import pytest from playwright.sync_api import Page -from pytest_simcore.logging_utils import log_context -from pytest_simcore.playwright_utils import RunningState +from pytest_simcore.helpers.logging import log_context +from pytest_simcore.helpers.playwright import RunningState @pytest.fixture diff --git a/tests/e2e-playwright/tests/tip/test_ti_plan.py b/tests/e2e-playwright/tests/tip/test_ti_plan.py index 49b18a4dc39..7b09ec85dac 100644 --- a/tests/e2e-playwright/tests/tip/test_ti_plan.py +++ b/tests/e2e-playwright/tests/tip/test_ti_plan.py @@ -14,8 +14,8 @@ from typing import Any, Final from playwright.sync_api import Page, WebSocket -from pytest_simcore.logging_utils import log_context -from pytest_simcore.playwright_utils import ( +from pytest_simcore.helpers.logging import log_context +from pytest_simcore.helpers.playwright import ( MINUTE, SECOND, app_mode_trigger_next_app, diff --git a/tests/public-api/conftest.py b/tests/public-api/conftest.py index 5226461c28e..935d63a18a8 100644 --- a/tests/public-api/conftest.py +++ b/tests/public-api/conftest.py @@ -9,15 +9,15 @@ import logging import os import time +from collections.abc import Callable, Iterable, Iterator from pprint import pformat -from typing import Callable, Iterable, Iterator import httpx import osparc import pytest +from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict from pytest_simcore.helpers.typing_docker import UrlStr -from pytest_simcore.helpers.utils_envs import EnvVarsDict -from pytest_simcore.helpers.utils_public_api import ( +from pytest_simcore.helpers.typing_public_api import ( RegisteredUserDict, ServiceInfoDict, ServiceNameStr, @@ -38,12 +38,10 @@ "pytest_simcore.docker_compose", "pytest_simcore.docker_registry", "pytest_simcore.docker_swarm", - "pytest_simcore.monkeypatch_extra", "pytest_simcore.pytest_global_environs", "pytest_simcore.repository_paths", "pytest_simcore.schemas", "pytest_simcore.simcore_services", - "pytest_simcore.tmp_path_extra", ] @@ -196,7 +194,7 @@ def services_registry( "description": "A service which awaits for time to pass, two times.", "inputs": { "input_1": { - "description": "Pick a file containing only one " "integer", + "description": "Pick a file containing only one integer", "displayOrder": 1, "fileToKeyMap": {"single_number.txt": "input_1"}, "label": "File with int number", @@ -220,7 +218,7 @@ def services_registry( }, "input_4": { "defaultValue": 0, - "description": "It will first walk the distance to " "bed", + "description": "It will first walk the distance to bed", "displayOrder": 4, "label": "Distance to bed", "type": "integer", @@ -239,7 +237,7 @@ def services_registry( "type": "data:text/plain", }, "output_2": { - "description": "Interval is generated in range " "[1-9]", + "description": "Interval is generated in range [1-9]", "displayOrder": 2, "label": "Random sleep interval", "type": "integer", diff --git a/tests/public-api/test_solvers_api.py b/tests/public-api/test_solvers_api.py index 4d6f3f78541..9698b4c327b 100644 --- a/tests/public-api/test_solvers_api.py +++ b/tests/public-api/test_solvers_api.py @@ -11,7 +11,7 @@ import osparc import pytest from packaging.version import parse as parse_version -from pytest_simcore.helpers.utils_public_api import ServiceInfoDict, ServiceNameStr +from pytest_simcore.helpers.typing_public_api import ServiceInfoDict, ServiceNameStr class NameTagTuple(NamedTuple): diff --git a/tests/public-api/test_solvers_jobs_api.py b/tests/public-api/test_solvers_jobs_api.py index e861f30c982..ddd6445f11e 100644 --- a/tests/public-api/test_solvers_jobs_api.py +++ b/tests/public-api/test_solvers_jobs_api.py @@ -19,7 +19,7 @@ import osparc import pytest -from pytest_simcore.helpers.utils_public_api import ServiceInfoDict, ServiceNameStr +from pytest_simcore.helpers.typing_public_api import ServiceInfoDict, ServiceNameStr osparc_VERSION = tuple(map(int, osparc.__version__.split("."))) assert osparc_VERSION >= (0, 4, 3) diff --git a/tests/public-api/test_users_api.py b/tests/public-api/test_users_api.py index 82fae651f55..0b953ddf182 100644 --- a/tests/public-api/test_users_api.py +++ b/tests/public-api/test_users_api.py @@ -8,7 +8,7 @@ import osparc import pytest -from pytest_simcore.helpers.utils_public_api import RegisteredUserDict +from pytest_simcore.helpers.typing_public_api import RegisteredUserDict @pytest.fixture(scope="module") diff --git a/tests/swarm-deploy/conftest.py b/tests/swarm-deploy/conftest.py index 687157f9381..c295e328fc8 100644 --- a/tests/swarm-deploy/conftest.py +++ b/tests/swarm-deploy/conftest.py @@ -10,7 +10,7 @@ from docker import DockerClient from docker.models.services import Service from pytest_simcore.docker_swarm import assert_service_is_running -from pytest_simcore.helpers.utils_environs import EnvVarsDict +from pytest_simcore.helpers.deprecated_environs import EnvVarsDict from tenacity import Retrying from tenacity.before_sleep import before_sleep_log from tenacity.stop import stop_after_delay @@ -25,7 +25,6 @@ "pytest_simcore.rabbit_service", "pytest_simcore.repository_paths", "pytest_simcore.simcore_webserver_service", - "pytest_simcore.tmp_path_extra", "pytest_simcore.traefik_service", ]