cleanup

Author: pcrespov

services/web/server/tests/sandbox/app.py

@@ -6,7 +6,6 @@
 from aiohttp import web
 from aiohttp.web import middleware
 from multidict import MultiDict
-
 from simcore_service_webserver._meta import api_vtag
 
 # FRONT_END ####################################
@@ -91,7 +90,7 @@ async def discover_product_middleware(request, handler):
         request[RQ_PRODUCT_NAME_KEY] = frontend_app
 
     else:
-        #/s4/boot.js is called with 'Referer': 'http://localhost:9081/s4l/index.html'
+        # /s4/boot.js is called with 'Referer': 'http://localhost:9081/s4l/index.html'
 
         # if path to index
         match = PRODUCT_PATH_RE.match(request.path)
@@ -102,7 +101,7 @@ async def discover_product_middleware(request, handler):
     response = await handler(request)
 
     # FIXME: notice that if raised error, it will not be attached
-    #if RQ_PRODUCT_NAME_KEY in request:
+    # if RQ_PRODUCT_NAME_KEY in request:
     #    response.headers[PRODUCT_NAME_HEADER] = request[RQ_PRODUCT_NAME_KEY]
 
     return response
@@ -113,7 +112,6 @@ async def discover_product_middleware(request, handler):
 async def serve_default_app(request):
     # TODO: check url and defined what is the default??
     print("Request from", request.headers["Host"])
-    import pdb; pdb.set_trace()
 
     target_product = request.get(RQ_PRODUCT_NAME_KEY, default_frontend_app)
 

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

@@ -15,7 +15,7 @@
 import textwrap
 from copy import deepcopy
 from pathlib import Path
-from typing import Callable, Dict, List, Optional
+from typing import Callable, Dict, Iterator, List, Optional
 from uuid import uuid4
 
 import aioredis
@@ -99,7 +99,7 @@ def docker_compose_file(default_app_cfg):
 
 
 @pytest.fixture(scope="function")
-def app_cfg(default_app_cfg, aiohttp_unused_port):
+def app_cfg(default_app_cfg, aiohttp_unused_port) -> Dict:
     """Can be overriden in any test module to configure
     the app accordingly
     """
@@ -157,7 +157,7 @@ def client(loop, aiohttp_client, web_server, mock_orphaned_services) -> TestClie
 
 
 @pytest.fixture
-def qx_client_outdir(tmpdir):
+def qx_client_outdir(tmpdir) -> Path:
     """Emulates qx output at service/web/client after compiling"""
 
     basedir = tmpdir.mkdir("source-output")
@@ -324,11 +324,15 @@ def postgres_service(docker_services, postgres_dsn):
 
 
 @pytest.fixture
-def postgres_db(postgres_dsn: Dict, postgres_service: str) -> sa.engine.Engine:
+def postgres_db(
+    postgres_dsn: Dict, postgres_service: str
+) -> Iterator[sa.engine.Engine]:
+    # Overrides packages/pytest-simcore/src/pytest_simcore/postgres_service.py::postgres_db to reduce scope
     url = postgres_service
 
     # Configures db and initializes tables
-    pg_cli.discover.callback(**postgres_dsn)
+    kwargs = postgres_dsn.copy()
+    pg_cli.discover.callback(**kwargs)
     pg_cli.upgrade.callback("head")
     # Uses syncrounous engine for that
     engine = sa.create_engine(url, isolation_level="AUTOCOMMIT")
@@ -384,7 +388,7 @@ def create_url(client_override: Optional[TestClient] = None) -> str:
         SOCKET_IO_PATH = "/socket.io/"
         return str((client_override or client).make_url(SOCKET_IO_PATH))
 
-    yield create_url
+    return create_url
 
 
 @pytest.fixture()
@@ -403,7 +407,7 @@ async def creator(client_override: Optional[TestClient] = None) -> str:
         )
         return cookie
 
-    yield creator
+    return creator
 
 
 @pytest.fixture()