small refactor

Author: matusdrobuliak66

services/api-server/tests/unit/pact_broker/conftest.py

@@ -1,6 +1,15 @@
 import os
+from threading import Thread
+from time import sleep
 
 import pytest
+import uvicorn
+from fastapi import FastAPI
+from servicelib.utils import unused_port
+from simcore_service_api_server.api.dependencies.authentication import (
+    Identity,
+    get_current_identity,
+)
 
 
 def pytest_addoption(parser: pytest.Parser) -> None:
@@ -60,3 +69,42 @@ def pact_broker_credentials(
         )
 
     return broker_url, broker_username, broker_password
+
+
+def mock_get_current_identity() -> Identity:
+    return Identity(user_id=1, product_name="osparc", email="[email protected]")
+
+
+@pytest.fixture()
+def run_test_server(
+    app: FastAPI,
+):
+    """
+    Spins up a FastAPI server in a background thread and yields a base URL.
+    The 'mocked_catalog_service' fixture ensures the function is already
+    patched by the time we start the server.
+    """
+    # Override
+    app.dependency_overrides[get_current_identity] = mock_get_current_identity
+
+    port = unused_port()
+    base_url = f"http://localhost:{port}"
+
+    config = uvicorn.Config(
+        app,
+        host="localhost",
+        port=port,
+        log_level="info",
+    )
+    server = uvicorn.Server(config)
+
+    thread = Thread(target=server.run, daemon=True)
+    thread.start()
+
+    # Wait a bit for the server to be ready
+    sleep(1)
+
+    yield base_url  # , before_server_start
+
+    server.should_exit = True
+    thread.join()

services/api-server/tests/unit/pact_broker/test_pact_licensed_items.py

@@ -4,34 +4,21 @@
 # pylint: disable=too-many-arguments
 
 import os
-from threading import Thread
-from time import sleep
 
 import pytest
-import uvicorn
 from fastapi import FastAPI
 from models_library.api_schemas_webserver.licensed_items import (
     LicensedItemRpcGet,
     LicensedItemRpcGetPage,
 )
 from pact.v3 import Verifier
 from pytest_mock import MockerFixture
-from servicelib.utils import unused_port
 from simcore_service_api_server._meta import API_VERSION
-from simcore_service_api_server.api.dependencies.authentication import (
-    Identity,
-    get_current_identity,
-)
 from simcore_service_api_server.api.dependencies.webserver_rpc import (
     get_wb_api_rpc_client,
 )
 from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
 
-
-def mock_get_current_identity() -> Identity:
-    return Identity(user_id=1, product_name="osparc", email="[email protected]")
-
-
 # Fake response based on values from 05_licensed_items.json
 EXPECTED_LICENSED_ITEMS = [
     {
@@ -164,43 +151,6 @@ async def mock_wb_api_server_rpc(app: FastAPI, mocker: MockerFixture) -> MockerF
     return mocker
 
 
-@pytest.fixture()
-def run_test_server(
-    # get_free_port: int,
-    # get_unused_port: int,
-    app: FastAPI,
-):
-    """
-    Spins up a FastAPI server in a background thread and yields a base URL.
-    The 'mocked_catalog_service' fixture ensures the function is already
-    patched by the time we start the server.
-    """
-    # Override
-    app.dependency_overrides[get_current_identity] = mock_get_current_identity
-
-    port = unused_port()
-    base_url = f"http://localhost:{port}"
-
-    config = uvicorn.Config(
-        app,
-        host="localhost",
-        port=port,
-        log_level="info",
-    )
-    server = uvicorn.Server(config)
-
-    thread = Thread(target=server.run, daemon=True)
-    thread.start()
-
-    # Wait a bit for the server to be ready
-    sleep(1)
-
-    yield base_url  # , before_server_start
-
-    server.should_exit = True
-    thread.join()
-
-
 @pytest.mark.skipif(
     not os.getenv("PACT_BROKER_URL"),
     reason="This test runs only if PACT_BROKER_URL is provided",