ports

Author: pcrespov

services/web/server/tests/unit/isolated/test__redirections.py

@@ -5,10 +5,13 @@
 
 import asyncio
 import textwrap
+from collections.abc import Callable
 from pathlib import Path
+from typing import Awaitable
 
 import pytest
 from aiohttp import web
+from aiohttp.test_utils import TestClient
 
 
 @pytest.fixture
@@ -34,7 +37,11 @@ def index_static_path(tmpdir):
 
 
 @pytest.fixture
-def client(event_loop: asyncio.AbstractEventLoop, aiohttp_client, index_static_path):
+def client(
+    event_loop: asyncio.AbstractEventLoop,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
+    index_static_path,
+):
 
     routes = web.RouteTableDef()
 

services/web/server/tests/unit/isolated/test_activity.py

@@ -4,7 +4,7 @@
 
 import asyncio
 import os
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from typing import Any
 from unittest.mock import MagicMock
 
@@ -101,7 +101,7 @@ def app_environment(
 @pytest.fixture
 def client(
     event_loop: asyncio.AbstractEventLoop,
-    aiohttp_client: Callable,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
     mock_orphaned_services: MagicMock,
     app_environment: EnvVarsDict,
 ):

services/web/server/tests/unit/isolated/test_diagnostics_healthcheck.py

@@ -7,8 +7,8 @@
 import asyncio
 import json
 import logging
-from collections.abc import Callable, Coroutine
 import time
+from collections.abc import Awaitable, Callable, Coroutine
 
 import pytest
 import simcore_service_webserver
@@ -89,12 +89,14 @@ def mock_environment(
         {
             **mock_env_devel_environment,
             "AIODEBUG_SLOW_DURATION_SECS": f"{SLOW_HANDLER_DELAY_SECS / 10}",
-            "WEBSERVER_DIAGNOSTICS": json.dumps({
-                "DIAGNOSTICS_MAX_AVG_LATENCY": "2.0",
-                "DIAGNOSTICS_MAX_TASK_DELAY": f"{SLOW_HANDLER_DELAY_SECS}",
-                "DIAGNOSTICS_START_SENSING_DELAY": f"{0}",
-                "DIAGNOSTICS_HEALTHCHECK_ENABLED": "1",
-            }),
+            "WEBSERVER_DIAGNOSTICS": json.dumps(
+                {
+                    "DIAGNOSTICS_MAX_AVG_LATENCY": "2.0",
+                    "DIAGNOSTICS_MAX_TASK_DELAY": f"{SLOW_HANDLER_DELAY_SECS}",
+                    "DIAGNOSTICS_START_SENSING_DELAY": f"{0}",
+                    "DIAGNOSTICS_HEALTHCHECK_ENABLED": "1",
+                }
+            ),
             "SC_HEALTHCHECK_TIMEOUT": "2m",
         },
     )
@@ -104,7 +106,7 @@ def mock_environment(
 def client(
     event_loop: asyncio.AbstractEventLoop,
     unused_tcp_port_factory: Callable,
-    aiohttp_client: Callable,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
     api_version_prefix: str,
     mock_environment: EnvVarsDict,
 ) -> TestClient:

services/web/server/tests/unit/isolated/test_rest.py

@@ -3,7 +3,7 @@
 # pylint:disable=no-name-in-module
 
 import asyncio
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from http import HTTPStatus
 from unittest.mock import MagicMock
 
@@ -24,7 +24,7 @@
 def client(
     event_loop: asyncio.AbstractEventLoop,
     unused_tcp_port_factory: Callable,
-    aiohttp_client: Callable,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
     api_version_prefix: str,
     mock_env_devel_environment: EnvVarsDict,
     mock_env_deployer_pipeline: EnvVarsDict,

services/web/server/tests/unit/isolated/test_security_api.py

@@ -6,7 +6,7 @@
 import asyncio
 import statistics
 from collections import OrderedDict
-from collections.abc import Callable
+from collections.abc import Awaitable, Callable
 from typing import Any
 from unittest.mock import MagicMock
 
@@ -205,7 +205,7 @@ async def _logout(request: web.Request):
 @pytest.fixture
 def client(
     event_loop: asyncio.AbstractEventLoop,
-    aiohttp_client: Callable,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
     mocker: MockerFixture,
     app_products: OrderedDict[str, Product],
     set_products_in_app_state: Callable[

services/web/server/tests/unit/isolated/test_utils_rate_limiting.py

@@ -4,6 +4,7 @@
 
 import asyncio
 import time
+from collections.abc import Awaitable
 from typing import Callable
 
 import pytest
@@ -28,7 +29,10 @@ async def get_ok_handler(_request: web.Request):
 
 
 @pytest.fixture
-def client(event_loop, aiohttp_client: Callable) -> TestClient:
+def client(
+    event_loop,
+    aiohttp_client: Callable[..., Awaitable[TestClient]],
+) -> TestClient:
     app = web.Application()
     app.router.add_get("/", get_ok_handler)
 

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

@@ -1,13 +1,15 @@
-# pylint:disable=unused-import
-# pylint:disable=unused-argument
-# pylint:disable=redefined-outer-name
+# pylint: disable=redefined-outer-name
+# pylint: disable=unused-argument
+# pylint: disable=unused-variable
+# pylint: disable=too-many-arguments
 
 import asyncio
+from collections.abc import Awaitable, Callable
 from urllib.parse import quote
 
 import pytest
 from aiohttp import web
-from aiohttp.test_utils import TestServer
+from aiohttp.test_utils import TestClient, TestServer
 from faker import Faker
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.typing_env import EnvVarsDict
@@ -22,9 +24,10 @@
 @pytest.fixture()
 def storage_server(
     event_loop: asyncio.AbstractEventLoop,
-    aiohttp_server: TestServer,
+    aiohttp_server: Callable[..., Awaitable[TestServer]],
     app_environment: EnvVarsDict,
-):
+    storage_test_server_port: int,
+) -> TestServer:
     async def _get_locs(request: web.Request):
         assert not request.can_read_body
 
@@ -125,6 +128,7 @@ async def _get_datasets_meta(request: web.Request):
 
     storage_api_version = app_environment["STORAGE_VTAG"]
     storage_port = int(app_environment["STORAGE_PORT"])
+    assert storage_port == storage_test_server_port
 
     assert (
         storage_api_version != API_VERSION
@@ -164,7 +168,9 @@ async def _get_datasets_meta(request: web.Request):
         (UserRole.TESTER, status.HTTP_200_OK),
     ],
 )
-async def test_get_storage_locations(client, storage_server, logged_user, expected):
+async def test_get_storage_locations(
+    client: TestClient, storage_server: TestServer, logged_user, expected
+):
     url = "/v0/storage/locations"
     assert url.startswith(PREFIX)
 
@@ -186,7 +192,9 @@ async def test_get_storage_locations(client, storage_server, logged_user, expect
         (UserRole.ADMIN, status.HTTP_200_OK),
     ],
 )
-async def test_sync_file_meta_table(client, storage_server, logged_user, expected):
+async def test_sync_file_meta_table(
+    client: TestClient, storage_server: TestServer, logged_user, expected
+):
     url = "/v0/storage/locations/0:sync"
     assert url.startswith(PREFIX)
 
@@ -208,7 +216,9 @@ async def test_sync_file_meta_table(client, storage_server, logged_user, expecte
         (UserRole.TESTER, status.HTTP_200_OK),
     ],
 )
-async def test_get_datasets_metadata(client, storage_server, logged_user, expected):
+async def test_get_datasets_metadata(
+    client: TestClient, storage_server: TestServer, logged_user, expected
+):
     url = "/v0/storage/locations/0/datasets"
     assert url.startswith(PREFIX)
 
@@ -234,7 +244,7 @@ async def test_get_datasets_metadata(client, storage_server, logged_user, expect
     ],
 )
 async def test_get_files_metadata_dataset(
-    client, storage_server, logged_user, expected
+    client: TestClient, storage_server: TestServer, logged_user, expected
 ):
     url = "/v0/storage/locations/0/datasets/N:asdfsdf/metadata"
     assert url.startswith(PREFIX)
@@ -263,7 +273,7 @@ async def test_get_files_metadata_dataset(
     ],
 )
 async def test_storage_file_meta(
-    client, storage_server, logged_user, expected, faker: Faker
+    client: TestClient, storage_server: TestServer, logged_user, expected, faker: Faker
 ):
     # tests redirect of path with quotes in path
     file_id = f"{faker.uuid4()}/{faker.uuid4()}/a/b/c/d/e/dat"
@@ -289,7 +299,9 @@ async def test_storage_file_meta(
         (UserRole.TESTER, status.HTTP_200_OK),
     ],
 )
-async def test_storage_list_filter(client, storage_server, logged_user, expected):
+async def test_storage_list_filter(
+    client: TestClient, storage_server: TestServer, logged_user, expected
+):
     # tests composition of 2 queries
     file_id = "a/b/c/d/e/dat"
     url = "/v0/storage/locations/0/files/metadata?uuid_filter={}".format(

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

@@ -118,12 +118,27 @@ def docker_compose_file(docker_compose_env: pytest.MonkeyPatch) -> str:
 # WEB SERVER/CLIENT FIXTURES ------------------------------------------------
 
 
+@pytest.fixture
+def web_test_server_port(unused_tcp_port_factory: Callable):
+    return unused_tcp_port_factory()
+
+
+@pytest.fixture
+def storage_test_server_port(
+    unused_tcp_port_factory: Callable, web_test_server_port: int
+):
+    port = unused_tcp_port_factory()
+    assert port != web_test_server_port
+    return port
+
+
 @pytest.fixture
 def app_environment(
     monkeypatch: pytest.MonkeyPatch,
     default_app_cfg: AppConfigDict,
     unused_tcp_port_factory: Callable,
     mock_env_devel_environment: EnvVarsDict,
+    storage_test_server_port: int,
     monkeypatch_setenv_from_app_config: Callable[[AppConfigDict], EnvVarsDict],
 ) -> EnvVarsDict:
     # WARNING: this fixture is commonly overriden. Check before renaming.
@@ -138,7 +153,7 @@ 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()
+    cfg["storage"]["port"] = storage_test_server_port
     envs_app_cfg = monkeypatch_setenv_from_app_config(cfg)
 
     return (
@@ -189,6 +204,7 @@ def web_server(
     unused_tcp_port_factory: Callable,
     app_environment: EnvVarsDict,
     postgres_db: sa.engine.Engine,
+    web_test_server_port: int,
     # tools
     aiohttp_server: Callable,
     mocked_send_email: None,
@@ -201,7 +217,7 @@ def web_server(
     disable_static_webserver(app)
 
     server = event_loop.run_until_complete(
-        aiohttp_server(app, port=unused_tcp_port_factory())
+        aiohttp_server(app, port=web_test_server_port)
     )
 
     assert isinstance(postgres_db, sa.engine.Engine)