From ec2fb058b4dd117157211d35060aa856b8ae53ff Mon Sep 17 00:00:00 2001 From: Matthew Evans Date: Fri, 7 Jul 2023 19:14:17 +0100 Subject: [PATCH] Fix graph tests --- pydatalab/pydatalab/routes/v0_1/graphs.py | 2 +- pydatalab/tests/routers/test_samples.py | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/pydatalab/pydatalab/routes/v0_1/graphs.py b/pydatalab/pydatalab/routes/v0_1/graphs.py index f2b268cb0..1cd219099 100644 --- a/pydatalab/pydatalab/routes/v0_1/graphs.py +++ b/pydatalab/pydatalab/routes/v0_1/graphs.py @@ -54,7 +54,7 @@ def get_graph_cy_format(item_id: Optional[str] = None): node_collections.add(relationship["immutable_id"]) continue - if relationship.get("relation") != "parent": + if relationship.get("relation") not in ("parent", "is_part_of"): continue target = document["item_id"] diff --git a/pydatalab/tests/routers/test_samples.py b/pydatalab/tests/routers/test_samples.py index d063e593d..49900f7ae 100644 --- a/pydatalab/tests/routers/test_samples.py +++ b/pydatalab/tests/routers/test_samples.py @@ -389,6 +389,7 @@ def test_create_cell(client, default_cell): assert response.status_code == 201, response.json assert response.json["status"] == "success" + @pytest.mark.dependency(depends=["test_create_cell"]) def test_create_collections(client, default_collection): @@ -418,13 +419,13 @@ def test_create_collections(client, default_collection): data = json.loads(new_collection.json()) data.update( - { - "starting_members": [ - {"item_id": "copy_of_complicated_cell"}, - {"item_id": "test_cell"}, - ] - } - ) + { + "starting_members": [ + {"item_id": "copy_of_complicated_cell"}, + {"item_id": "test_cell"}, + ] + } + ) response = client.put("/collections/", json={"data": data}) assert response.status_code == 201, response.json assert response.json["status"] == "success"