cleanup imports

Author: pcrespov

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -26,8 +26,8 @@
 from models_library.groups import EVERYONE_GROUP_ID, StandardGroupCreate
 from models_library.projects_state import RunningState
 from pytest_mock import MockerFixture
-from pytest_simcore.helpers.webserver_login import UserInfoDict, log_client_in
 from pytest_simcore.helpers.webserver_projects import create_project, empty_project_data
+from pytest_simcore.helpers.webserver_users import UserInfoDict, log_client_in
 from servicelib.aiohttp.application import create_safe_application
 from settings_library.rabbit import RabbitSettings
 from settings_library.redis import RedisDatabase, RedisSettings

services/web/server/tests/integration/02/notifications/test_rabbitmq_consumers.py

@@ -30,7 +30,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.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from redis import Redis
 from servicelib.aiohttp.application import create_safe_application
 from servicelib.aiohttp.monitor_services import (

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

@@ -16,8 +16,8 @@
 from aiohttp.test_utils import TestClient
 from models_library.products import ProductName
 from pytest_mock import MockFixture, MockType
-from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_projects import NewProject, empty_project_data
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.constants import FRONTEND_APP_DEFAULT
 from simcore_service_webserver.projects.models import ProjectDict

services/web/server/tests/unit/with_dbs/01/groups/test_groups_handlers_crud.py

@@ -12,11 +12,11 @@
 from models_library.api_schemas_webserver.groups import GroupGet, MyGroupsGet
 from pydantic import TypeAdapter
 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,
     standard_role_response,
 )
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver._meta import API_VTAG

services/web/server/tests/unit/with_dbs/01/storage/test_storage.py

@@ -54,7 +54,7 @@
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
-from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
 from servicelib.rabbitmq.rpc_interfaces.async_jobs.async_jobs import (

services/web/server/tests/unit/with_dbs/01/storage/test_storage_handlers.py

@@ -18,7 +18,7 @@
 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.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp.rest_responses import wrap_as_envelope
 from simcore_postgres_database.models.users import UserRole
 

services/web/server/tests/unit/with_dbs/01/test_api_keys.py

@@ -22,7 +22,7 @@
 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.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.api_keys import _repository, api_keys_service
 from simcore_service_webserver.api_keys.models import ApiKey

services/web/server/tests/unit/with_dbs/01/test_api_keys_rpc.py

@@ -14,7 +14,7 @@
 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.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.rabbitmq import RabbitMQRPCClient
 from servicelib.rabbitmq.rpc_interfaces.webserver.auth.api_keys import (
     create_api_key,

services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__pricing_plan.py

@@ -15,7 +15,7 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pytest_simcore.aioresponses_mocker import AioResponsesMock
 from pytest_simcore.helpers.assert_checks import assert_status
-from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from settings_library.resource_usage_tracker import ResourceUsageTrackerSettings
 from simcore_service_webserver.db.models import UserRole

services/web/server/tests/unit/with_dbs/01/test_catalog_handlers__services.py

@@ -24,7 +24,7 @@
 from pytest_simcore.helpers.faker_factories import random_icon_url
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
-from pytest_simcore.helpers.webserver_login import UserInfoDict
+from pytest_simcore.helpers.webserver_users import UserInfoDict
 from servicelib.aiohttp import status
 from simcore_service_webserver.catalog._controller_rest_schemas import (
     ServiceInputGet,