fix tests

Author: matusdrobuliak66

services/web/server/src/simcore_service_webserver/folders/_folders_repository.py

@@ -277,19 +277,21 @@ async def list_folders_db_as_admin(
     """
     NOTE: this is app-wide i.e. no product, user or workspace filtered
     """
-    base_query = sql.select(*_FOLDER_DB_MODEL_COLS).where(
-        folders_v2.c.trashed.is_not(None)
-    )
+    base_query = sql.select(*_FOLDER_DB_MODEL_COLS)
 
     if is_set(trashed_explicitly):
         assert isinstance(trashed_explicitly, bool)  # nosec
         base_query = base_query.where(
-            folders_v2.c.trashed_explicitly.is_(trashed_explicitly)
+            (folders_v2.c.trashed_explicitly.is_(trashed_explicitly))
+            & (folders_v2.c.trashed.is_not(None))
         )
 
     if is_set(trashed_before):
         assert isinstance(trashed_before, datetime)  # nosec
-        base_query = base_query.where(folders_v2.c.trashed < trashed_before)
+        base_query = base_query.where(
+            (folders_v2.c.trashed < trashed_before)
+            & (folders_v2.c.trashed.is_not(None))
+        )
 
     if is_set(shared_workspace_id):
         assert isinstance(shared_workspace_id, int)  # nosec

services/web/server/tests/unit/with_dbs/04/folders/test_folders.py

@@ -5,7 +5,6 @@
 # pylint: disable=too-many-statements
 
 
-import asyncio
 from http import HTTPStatus
 from unittest import mock
 
@@ -21,7 +20,6 @@
     standard_role_response,
 )
 from servicelib.aiohttp import status
-from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects._groups_repository import (
     GroupID,
@@ -495,15 +493,6 @@ async def test_folders_deletion(
     resp = await client.delete(f"{url}")
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
-    fire_and_forget_task: asyncio.Task = next(
-        iter(client.app[APP_FIRE_AND_FORGET_TASKS_KEY])
-    )
-    assert fire_and_forget_task.get_name().startswith(
-        "fire_and_forget_task_delete_project_task_"
-    )
-    await fire_and_forget_task
-    assert len(client.app[APP_FIRE_AND_FORGET_TASKS_KEY]) == 0
-
     # list root projects (The project should have been deleted)
     url = client.app.router["list_projects"].url_for()
     resp = await client.get(f"{url}")

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

@@ -5,6 +5,7 @@
 
 import pytest
 import sqlalchemy as sa
+from pytest_mock import MockerFixture
 from simcore_postgres_database.models.projects import projects
 from simcore_postgres_database.models.workspaces import workspaces
 
@@ -15,3 +16,17 @@ def workspaces_clean_db(postgres_db: sa.engine.Engine) -> Iterator[None]:
         yield
         con.execute(workspaces.delete())
         con.execute(projects.delete())
+
+
+@pytest.fixture
+def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
+    mocker.patch(
+        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
+        spec=True,
+        return_value=[],
+    )
+    mocker.patch(
+        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
+        spec=True,
+        return_value=True,
+    )

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces.py

@@ -11,6 +11,7 @@
 from aiohttp.test_utils import TestClient
 from models_library.api_schemas_webserver.workspaces import WorkspaceGet
 from models_library.rest_ordering import OrderDirection
+from pytest_mock import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_login import UserInfoDict
 from pytest_simcore.helpers.webserver_parametrizations import (
@@ -63,6 +64,7 @@ async def test_workspaces_workflow(
     logged_user: UserInfoDict,
     user_project: ProjectDict,
     expected: HTTPStatus,
+    mock_catalog_api_get_services_for_user_in_product: MockerFixture,
     workspaces_clean_db: AsyncIterator[None],
 ):
     assert client.app

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__delete_workspace_with_content.py

@@ -20,21 +20,6 @@
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
-
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
-        spec=True,
-        return_value=True,
-    )
-
-
 # @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 # async def test_workspaces_full_workflow_deletion(
 #     client: TestClient,

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__folders_and_projects_crud.py

@@ -5,7 +5,6 @@
 # pylint: disable=too-many-statements
 
 
-import asyncio
 from copy import deepcopy
 from http import HTTPStatus
 from unittest import mock
@@ -19,25 +18,10 @@
 from pytest_simcore.helpers.webserver_projects import create_project
 from pytest_simcore.helpers.webserver_workspaces import update_or_insert_workspace_group
 from servicelib.aiohttp import status
-from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.mark.parametrize("user_role,expected", [(UserRole.USER, status.HTTP_200_OK)])
 async def test_workspaces_full_workflow_with_folders_and_projects(
     client: TestClient,
@@ -365,16 +349,6 @@ async def test_workspaces_delete_folders(
     resp = await client.delete(f"{url}")
     await assert_status(resp, status.HTTP_204_NO_CONTENT)
 
-    fire_and_forget_tasks = list(client.app[APP_FIRE_AND_FORGET_TASKS_KEY])
-    t1: asyncio.Task = fire_and_forget_tasks[0]
-    t2: asyncio.Task = fire_and_forget_tasks[1]
-    assert t1.get_name().startswith("fire_and_forget_task_delete_project_task_")
-    assert t2.get_name().startswith("fire_and_forget_task_delete_project_task_")
-    await t1
-    await t2
-
-    assert len(client.app[APP_FIRE_AND_FORGET_TASKS_KEY]) == 0
-
     # List project in workspace (The projects should have been deleted)
     url = (
         client.app.router["list_projects"]

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__list_projects_full_search.py

@@ -19,21 +19,6 @@
 from simcore_service_webserver.db.models import UserRole
 from simcore_service_webserver.projects.models import ProjectDict
 
-
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
-        spec=True,
-        return_value=True,
-    )
-
-
 _SEARCH_NAME_1 = "Quantum Solutions"
 _SEARCH_NAME_2 = "Orion solution"
 _SEARCH_NAME_3 = "Skyline solutions"

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__moving_folders_between_workspaces.py

@@ -25,20 +25,6 @@ def user_role() -> UserRole:
     return UserRole.USER
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.fixture
 async def moving_folder_id(
     client: TestClient,

services/web/server/tests/unit/with_dbs/04/workspaces/test_workspaces__moving_projects_between_workspaces.py

@@ -25,20 +25,6 @@
 from simcore_service_webserver.projects.models import ProjectDict
 
 
-@pytest.fixture
-def mock_catalog_api_get_services_for_user_in_product(mocker: MockerFixture):
-    mocker.patch(
-        "simcore_service_webserver.projects._crud_api_read.catalog_service.get_services_for_user_in_product",
-        spec=True,
-        return_value=[],
-    )
-    mocker.patch(
-        "simcore_service_webserver.projects._controller.projects_rest.project_uses_available_services",
-        spec=True,
-        return_value=True,
-    )
-
-
 @pytest.mark.parametrize(*standard_role_response(), ids=str)
 async def test_moving_between_workspaces_user_role_permissions(
     client: TestClient,