rm unused app

Author: pcrespov

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

@@ -5,7 +5,6 @@
 import json
 import re
 from collections.abc import Callable
-from copy import deepcopy
 
 import pytest
 import sqlalchemy as sa
@@ -17,7 +16,6 @@
 from servicelib.aiohttp.application import create_safe_application
 from simcore_postgres_database.models.products import products
 from simcore_service_webserver.application_settings import setup_settings
-from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.db.plugin import setup_db
 from simcore_service_webserver.products.plugin import setup_products
 from simcore_service_webserver.rest.plugin import setup_rest
@@ -52,12 +50,8 @@ def client(
     app_environment: EnvVarsDict,
     event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
-    app_cfg: AppConfigDict,
     postgres_db: sa.engine.Engine,
 ) -> TestClient:
-    cfg = deepcopy(app_cfg)
-    port = cfg["main"]["port"]
-
     app = create_safe_application()
 
     settings = setup_settings(app)
@@ -68,7 +62,7 @@ def client(
     assert setup_statics(app)
 
     return event_loop.run_until_complete(
-        aiohttp_client(app, server_kwargs={"port": port, "host": "localhost"})
+        aiohttp_client(app, server_kwargs={"host": "localhost"})
     )
 
 

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

@@ -2,12 +2,15 @@
 # pylint:disable=unused-argument
 # pylint:disable=redefined-outer-name
 
+import asyncio
 from urllib.parse import quote
 
 import pytest
 from aiohttp import web
+from aiohttp.test_utils import TestServer
 from faker import Faker
 from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.typing_env import EnvVarsDict
 from servicelib.aiohttp import status
 from servicelib.aiohttp.application import create_safe_application
 from simcore_postgres_database.models.users import UserRole
@@ -17,10 +20,11 @@
 
 # TODO: create a fake storage service here
 @pytest.fixture()
-def storage_server(event_loop, aiohttp_server, app_cfg):
-    cfg = app_cfg["storage"]
-    app = create_safe_application(cfg)
-
+def storage_server(
+    event_loop: asyncio.AbstractEventLoop,
+    aiohttp_server: TestServer,
+    app_environment: EnvVarsDict,
+):
     async def _get_locs(request: web.Request):
         assert not request.can_read_body
 
@@ -119,11 +123,14 @@ async def _get_datasets_meta(request: web.Request):
             }
         )
 
-    storage_api_version = cfg["version"]
+    storage_api_version = app_environment["STORAGE_VTAG"]
+    storage_port = int(app_environment["STORAGE_PORT"])
+
     assert (
         storage_api_version != API_VERSION
     ), "backend service w/ different version as webserver entrypoint"
 
+    app = create_safe_application()
     app.router.add_get(f"/{storage_api_version}/locations", _get_locs)
     app.router.add_post(
         f"/{storage_api_version}/locations/0:sync", _post_sync_meta_data
@@ -140,9 +147,7 @@ async def _get_datasets_meta(request: web.Request):
         _get_datasets_meta,
     )
 
-    assert cfg["host"] == "localhost"
-
-    server = event_loop.run_until_complete(aiohttp_server(app, port=cfg["port"]))
+    server = event_loop.run_until_complete(aiohttp_server(app, port=storage_port))
     return server
 
 

services/web/server/tests/unit/with_dbs/03/tags/conftest.py

@@ -15,7 +15,6 @@
 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.application_settings_utils import AppConfigDict
 from simcore_service_webserver.db.plugin import setup_db
 from simcore_service_webserver.director_v2.plugin import setup_director_v2
 from simcore_service_webserver.login.plugin import setup_login
@@ -62,7 +61,6 @@ def app_environment(
 def client(
     event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
-    app_cfg: AppConfigDict,
     app_environment: EnvVarsDict,
     postgres_db,
     mocked_dynamic_services_interface,
@@ -94,9 +92,7 @@ def client(
 
     # server and client
     return event_loop.run_until_complete(
-        aiohttp_client(
-            app, server_kwargs={"port": app_cfg["main"]["port"], "host": "localhost"}
-        )
+        aiohttp_client(app, server_kwargs={"host": "localhost"})
     )
 
     # teardown here ...

services/web/server/tests/unit/with_dbs/03/test_session.py

@@ -15,7 +15,6 @@
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from pytest_simcore.helpers.webserver_login import NewUser
 from simcore_service_webserver.application import create_application
-from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.session._cookie_storage import (
     SharedCookieEncryptedCookieStorage,
 )
@@ -34,7 +33,6 @@ def client(
     event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
     disable_static_webserver: Callable,
-    app_cfg: AppConfigDict,
     app_environment: EnvVarsDict,
     postgres_db,
     mock_orphaned_services,  # disables gc
@@ -52,15 +50,7 @@ async def _get_user_session(request: web.Request):
 
     app.add_routes(extra_routes)
 
-    return event_loop.run_until_complete(
-        aiohttp_client(
-            app,
-            server_kwargs={
-                "port": app_cfg["main"]["port"],
-                "host": app_cfg["main"]["host"],
-            },
-        )
-    )
+    return event_loop.run_until_complete(aiohttp_client(app))
 
 
 async def test_security_identity_is_email_and_product(

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager.py

@@ -38,7 +38,6 @@
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from simcore_postgres_database.models.users import UserRole
 from simcore_service_webserver.application_settings import setup_settings
-from simcore_service_webserver.application_settings_utils import AppConfigDict
 from simcore_service_webserver.db.plugin import setup_db
 from simcore_service_webserver.director_v2.plugin import setup_director_v2
 from simcore_service_webserver.garbage_collector import _core as gc_core
@@ -128,7 +127,6 @@ def app_environment(
 def client(
     event_loop: asyncio.AbstractEventLoop,
     aiohttp_client: Callable,
-    app_cfg: AppConfigDict,
     app_environment: EnvVarsDict,
     postgres_db: sa.engine.Engine,
     mock_orphaned_services,
@@ -166,10 +164,6 @@ def client(
     return event_loop.run_until_complete(
         aiohttp_client(
             app,
-            server_kwargs={
-                "port": app_cfg["main"]["port"],
-                "host": app_cfg["main"]["host"],
-            },
         )
     )
 

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

@@ -138,9 +138,12 @@ def app_environment(app_environment: EnvVarsDict, monkeypatch: pytest.MonkeyPatc
     """
     # NOTE: remains from from old cfg
     cfg = deepcopy(default_app_cfg)
+    cfg["storage"]["port"] = unused_tcp_port_factory()
+    envs_app_cfg = monkeypatch_setenv_from_app_config(cfg)
+
     return (
         mock_env_devel_environment
-        | monkeypatch_setenv_from_app_config(cfg)
+        | envs_app_cfg
         | setenvs_from_dict(
             monkeypatch,
             {