deepdiff

Author: pcrespov

services/web/server/tests/unit/with_dbs/02/test_projects_crud_handlers.py

@@ -15,6 +15,7 @@
 import sqlalchemy as sa
 from aiohttp.test_utils import TestClient
 from aioresponses import aioresponses
+from deepdiff import DeepDiff
 from faker import Faker
 from models_library.api_schemas_directorv2.dynamic_services import (
     GetProjectInactivityResponse,
@@ -23,7 +24,10 @@
 from models_library.products import ProductName
 from pydantic import TypeAdapter
 from pytest_mock import MockerFixture
-from pytest_simcore.helpers.assert_checks import assert_status
+from pytest_simcore.helpers.assert_checks import (
+    assert_equal_ignoring_none,
+    assert_status,
+)
 from pytest_simcore.helpers.webserver_parametrizations import (
     ExpectedResponse,
     MockedStorageSubsystem,
@@ -174,7 +178,9 @@ async def _assert_get_same_project(
         project_permalink = data.pop("permalink", None)
         folder_id = data.pop("folderId", None)
 
-        assert data == {k: project[k] for k in data}
+        assert not DeepDiff(
+            data, {k: project[k] for k in data}, exclude_paths="root['lastChangeDate']"
+        )
 
         if project_state:
             assert ProjectStateOutputSchema.model_validate(project_state)
@@ -215,7 +221,11 @@ async def test_list_projects(
         project_permalink = got.pop("permalink")
         folder_id = got.pop("folderId")
 
-        assert got == {k: template_project[k] for k in got}
+        assert not DeepDiff(
+            got,
+            {k: template_project[k] for k in got},
+            exclude_paths="root['lastChangeDate']",
+        )
 
         assert not ProjectStateOutputSchema(
             **project_state
@@ -228,7 +238,11 @@ async def test_list_projects(
         project_permalink = got.pop("permalink", None)
         folder_id = got.pop("folderId")
 
-        assert got == {k: user_project[k] for k in got}
+        assert not DeepDiff(
+            got,
+            {k: user_project[k] for k in got},
+            exclude_paths="root['lastChangeDate']",
+        )
 
         assert ProjectStateOutputSchema(**project_state)
         assert project_permalink is None
@@ -245,7 +259,12 @@ async def test_list_projects(
         project_permalink = got.pop("permalink", None)
         folder_id = got.pop("folderId")
 
-        assert got == {k: user_project[k] for k in got}
+        assert not DeepDiff(
+            got,
+            {k: user_project[k] for k in got},
+            exclude_paths="root['lastChangeDate']",
+        )
+
         assert not ProjectStateOutputSchema(
             **project_state
         ).share_state.locked, "Single user does not lock"
@@ -263,7 +282,11 @@ async def test_list_projects(
         project_permalink = got.pop("permalink")
         folder_id = got.pop("folderId")
 
-        assert got == {k: template_project[k] for k in got}
+        assert not DeepDiff(
+            got,
+            {k: template_project[k] for k in got},
+            exclude_paths="root['lastChangeDate']",
+        )
         assert not ProjectStateOutputSchema(
             **project_state
         ).share_state.locked, "Templates are not locked"
@@ -632,7 +655,7 @@ async def test_new_template_from_project(
         )
 
         assert len(templates) == 1
-        assert templates[0] == template_project
+        assert_equal_ignoring_none(template_project, templates[0])
 
         assert template_project["name"] == user_project["name"]
         assert template_project["description"] == user_project["description"]

services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handlers__patch.py

@@ -12,6 +12,7 @@
 
 import pytest
 from aiohttp.test_utils import TestClient
+from deepdiff import DeepDiff
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.assert_checks import assert_status
 from pytest_simcore.helpers.webserver_users import UserInfoDict
@@ -168,7 +169,9 @@ async def test_patch_project_node(
             "output_1": {
                 "store": 0,
                 "path": "9934cba6-4b51-11ef-968a-02420a00f1c1/571ffc8d-fa6e-411f-afc8-9c62d08dd2fa/matus.txt",
+                "label": "matus.txt",
                 "eTag": "d41d8cd98f00b204e9800998ecf8427e",
+                "dataset": None,
             }
         }
     }
@@ -185,7 +188,6 @@ async def test_patch_project_node(
     _tested_node = data["workbench"][node_id]
 
     assert _tested_node["label"] == "testing-string"
-    assert _tested_node["progress"] is None
     assert _tested_node["key"] == _patch_key["key"]
     assert _tested_node["version"] == _patch_version["version"]
     assert _tested_node["inputs"] == _patch_inputs["inputs"]
@@ -262,10 +264,14 @@ async def test_patch_project_node_inputs_notifies(
     await assert_status(resp, expected)
     assert mocked_notify_project_node_update.call_count > 1
     # 1 message per node updated
-    assert [
-        call_args[0][2]
-        for call_args in mocked_notify_project_node_update.await_args_list
-    ] == list(user_project["workbench"].keys())
+    assert not DeepDiff(
+        [
+            call_args[0][2]
+            for call_args in mocked_notify_project_node_update.await_args_list
+        ],
+        list(user_project["workbench"].keys()),
+        ignore_order=True,
+    )
 
 
 @pytest.mark.parametrize(

services/web/server/tests/unit/with_dbs/02/test_projects_ports_handlers.py

@@ -12,6 +12,7 @@
 import pytest
 from aiohttp.test_utils import TestClient
 from aioresponses import aioresponses as AioResponsesMock  # noqa: N812
+from deepdiff import DeepDiff
 from models_library.api_schemas_directorv2.computations import TasksOutputs
 from models_library.api_schemas_webserver.projects import ProjectGet
 from models_library.utils.fastapi_encoders import jsonable_encoder
@@ -74,7 +75,7 @@ def mock_directorv2_service_api_responses(
     return aioresponses_mocker
 
 
-@pytest.mark.acceptance_test()
+@pytest.mark.acceptance_test
 @pytest.mark.parametrize(
     "user_role,expected",
     [
@@ -109,55 +110,62 @@ async def test_io_workflow(
     ports_meta, error = await assert_status(resp, expected_status_code=expected)
 
     if not error:
-        assert ports_meta == [
-            {
-                "key": "38a0d401-af4b-4ea7-ab4c-5005c712a546",
-                "kind": "input",
-                "content_schema": {
-                    "description": "Input integer value",
-                    "title": "X",
-                    "type": "integer",
+        diff = DeepDiff(
+            ports_meta,
+            [
+                {
+                    "key": "38a0d401-af4b-4ea7-ab4c-5005c712a546",
+                    "kind": "input",
+                    "content_schema": {
+                        "description": "Input integer value",
+                        "title": "X",
+                        "type": "integer",
+                    },
                 },
-            },
-            {
-                "key": "fc48252a-9dbb-4e07-bf9a-7af65a18f612",
-                "kind": "input",
-                "content_schema": {
-                    "description": "Input integer value",
-                    "title": "Z",
-                    "type": "integer",
+                {
+                    "key": "fc48252a-9dbb-4e07-bf9a-7af65a18f612",
+                    "kind": "input",
+                    "content_schema": {
+                        "description": "Input integer value",
+                        "title": "Z",
+                        "type": "integer",
+                    },
                 },
-            },
-            {
-                "key": "7bf0741f-bae4-410b-b662-fc34b47c27c9",
-                "kind": "input",
-                "content_schema": {
-                    "description": "Input boolean value",
-                    "title": "on",
-                    "type": "boolean",
+                {
+                    "key": "7bf0741f-bae4-410b-b662-fc34b47c27c9",
+                    "kind": "input",
+                    "content_schema": {
+                        "description": "Input boolean value",
+                        "title": "on",
+                        "type": "boolean",
+                    },
                 },
-            },
-            {
-                "key": "09fd512e-0768-44ca-81fa-0cecab74ec1a",
-                "kind": "output",
-                "content_schema": {
-                    "description": "Output integer value",
-                    "title": "Random sleep interval_2",
-                    "type": "integer",
+                {
+                    "key": "09fd512e-0768-44ca-81fa-0cecab74ec1a",
+                    "kind": "output",
+                    "content_schema": {
+                        "description": "Output integer value",
+                        "title": "Random sleep interval_2",
+                        "type": "integer",
+                    },
                 },
-            },
-            {
-                "key": "76f607b4-8761-4f96-824d-cab670bc45f5",
-                "kind": "output",
-                "content_schema": {
-                    "description": "Output integer value",
-                    "title": "Random sleep interval",
-                    "type": "integer",
+                {
+                    "key": "76f607b4-8761-4f96-824d-cab670bc45f5",
+                    "kind": "output",
+                    "content_schema": {
+                        "description": "Output integer value",
+                        "title": "Random sleep interval",
+                        "type": "integer",
+                    },
                 },
-            },
-        ]
+            ],
+            ignore_order=True,
+        )
 
-        assert ports_meta == PROJECTS_METADATA_PORTS_RESPONSE_BODY_DATA
+        assert not diff
+        assert not DeepDiff(
+            ports_meta, PROJECTS_METADATA_PORTS_RESPONSE_BODY_DATA, ignore_order=True
+        )
 
     # get_project_inputs
     expected_url = client.app.router["get_project_inputs"].url_for(

services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py

@@ -22,6 +22,7 @@
 import sqlalchemy as sa
 from aiohttp import ClientResponse
 from aiohttp.test_utils import TestClient, TestServer
+from deepdiff import DeepDiff  # type: ignore[attr-defined]
 from faker import Faker
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
@@ -95,10 +96,15 @@ def assert_replaced(current_project, update_data):
     def _extract(dikt, keys):
         return {k: dikt[k] for k in keys}
 
-    modified = [
+    skip = [
         "lastChangeDate",
+        "templateType",
+        "trashedAt",
+        "trashedBy",
+        "workspaceId",
+        "folderId",
     ]
-    keep = [k for k in update_data if k not in modified]
+    keep = [k for k in update_data if k not in skip]
 
     assert _extract(current_project, keep) == _extract(update_data, keep)
 
@@ -1200,7 +1206,7 @@ async def test_get_active_project(
         )
         assert not error
         assert ProjectStateOutputSchema(**data.pop("state")).share_state.locked
-        data.pop("folderId")
+        data.pop("folderId", None)
 
         user_project_last_change_date = user_project.pop("lastChangeDate")
         data_last_change_date = data.pop("lastChangeDate")
@@ -2114,7 +2120,11 @@ async def test_open_shared_project_at_same_time(
             elif data:
                 project_status = ProjectStateOutputSchema(**data.pop("state"))
                 data.pop("folderId")
-                assert data == {k: shared_project[k] for k in data}
+                assert not DeepDiff(
+                    data,
+                    {k: shared_project[k] for k in data},
+                    exclude_paths=["root['lastChangeDate']"],
+                )
                 assert project_status.share_state.locked
                 assert project_status.share_state.current_user_groupids
                 assert len(project_status.share_state.current_user_groupids) == 1