Restored pg downgrade and described fix

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/postgres_service.py

@@ -56,17 +56,10 @@ def postgres_engine(
     engine.dispose()
 
 
-@pytest.fixture(scope="module")
-def migration_downgrade_disabled() -> bool:
-    """ Override to enable migration downgrade step in postgres_db teardown """
-    return True
-
-
 @pytest.fixture(scope="module")
 def postgres_db(
     postgres_dsn: Dict,
     postgres_engine: sa.engine.Engine,
-    migration_downgrade_disabled: bool,
 ) -> sa.engine.Engine:
 
     # upgrades database from zero
@@ -76,17 +69,18 @@ def postgres_db(
 
     yield postgres_engine
 
-    if not migration_downgrade_disabled:
-        # NOTE: After discussion with ANE, this step delays tests and do not bring much as a fixture
-        # therefore it is added as optional
-
-        pg_cli.downgrade.callback("base")
-        pg_cli.clean.callback()
-        # FIXME: migration downgrade fails to remove all tables!!, added drop_all as tmp fix
-        metadata.drop_all(postgres_engine)
-
-    else:
-        metadata.drop_all(postgres_engine)
+    # downgrades database to zero ---
+    #
+    # NOTE: This step CANNOT be avoided since it would leave the db in an invalid state
+    # E.g. 'alembic_version' table is not deleted and keeps head version or routines
+    # like 'notify_comp_tasks_changed' remain undeleted
+    #
+    pg_cli.downgrade.callback("base")
+    pg_cli.clean.callback()  # just cleans discover cache
+
+    # FIXME: migration downgrade fails to remove User types SEE https://github.com/ITISFoundation/osparc-simcore/issues/1776
+    # Added drop_all as tmp fix
+    metadata.drop_all(postgres_engine)
 
 
 @pytest.fixture(scope="module")

services/web/server/tests/integration/computation/test_computation.py

@@ -42,14 +42,14 @@
 
 ops_services = [
     "minio",
-    #    'adminer',
-    #    'portainer'
-]
+]  # + ["adminer", "portainer"]
 
 
 @pytest.fixture
 def client(
-    loop, aiohttp_client, app_config,  ## waits until swarm with *_services are up
+    loop,
+    aiohttp_client,
+    app_config,  ## waits until swarm with *_services are up
 ):
     assert app_config["rest"]["version"] == API_VERSION
 

services/web/server/tests/integration/computation/test_rabbit.py

@@ -11,8 +11,8 @@
 
 import aio_pika
 import pytest
+import sqlalchemy as sa
 from mock import call
-from pytest_simcore.postgres_service import postgres_db
 
 from servicelib.application import create_safe_application
 from servicelib.application_keys import APP_CONFIG_KEY
@@ -36,8 +36,6 @@
 
 ops_services = []
 
-import sqlalchemy as sa
-
 
 @pytest.fixture
 def client(
@@ -184,7 +182,12 @@ async def _wait_until(pred: Callable, timeout: int):
 
 
 @pytest.mark.parametrize(
-    "user_role", [(UserRole.GUEST), (UserRole.USER), (UserRole.TESTER),]
+    "user_role",
+    [
+        (UserRole.GUEST),
+        (UserRole.USER),
+        (UserRole.TESTER),
+    ],
 )
 async def test_rabbit_websocket_computation(
     loop,

services/web/server/tests/integration/test_project_workflow.py

@@ -41,9 +41,7 @@
     "redis",
 ]
 
-ops_services = [
-    #    'adminer'
-]
+ops_services = []  # + ["adminer"]
 
 
 @pytest.fixture
@@ -122,7 +120,7 @@ def fake_project_data(fake_data_dir: Path) -> Dict:
 
 @pytest.fixture
 async def logged_user(client):  # , role: UserRole):
-    """ adds a user in db and logs in with client
+    """adds a user in db and logs in with client
 
     NOTE: role fixture is defined as a parametrization below
     """
@@ -150,9 +148,9 @@ def computational_system_mock(mocker):
 @pytest.fixture
 async def storage_subsystem_mock(loop, mocker):
     """
-        Patches client calls to storage service
+    Patches client calls to storage service
 
-        Patched functions are exposed within projects but call storage subsystem
+    Patched functions are exposed within projects but call storage subsystem
     """
     # requests storage to copy data
     mock = mocker.patch(