From 1d20070b8d356f3a63572b80b896e7d7ca7d1a8f Mon Sep 17 00:00:00 2001
From: Daniel <d.hornung@indiscale.com>
Date: Fri, 17 Feb 2023 12:41:43 +0100
Subject: [PATCH] FIX: recursive parent testing needed some modifications.
---
tests/test_parents.py | 2 +-
tests/test_recursive_parents.py | 29 ++++++++++++++++-------------
2 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/tests/test_parents.py b/tests/test_parents.py
index c8ddeeb..abae900 100644
--- a/tests/test_parents.py
+++ b/tests/test_parents.py
@@ -57,7 +57,7 @@ def test_get_parents_recursively():
# Retrieve only C
retrieved_C = db.RecordType(name="TestC").retrieve()
- parents = retrieved_C.get_parents_recursively()
+ parents = retrieved_C.get_parents_recursively(retrieve=True)
assert len(parents) == 2
assert "TestB" in [p.name for p in parents]
assert "TestA" in [p.name for p in parents]
diff --git a/tests/test_recursive_parents.py b/tests/test_recursive_parents.py
index 460be3c..fff5f64 100644
--- a/tests/test_recursive_parents.py
+++ b/tests/test_recursive_parents.py
@@ -48,7 +48,7 @@ def teardown_function(function):
setup_module()
-@pytest.mark.xfail(reason="To be fixed in server and/or pylib")
+# @pytest.mark.xfail(reason="To be fixed in server and/or pylib")
def test_recursive_parents():
# inheritance structure:
# A
@@ -66,29 +66,32 @@ def test_recursive_parents():
parents = C.get_parents_recursively()
assert len(parents) == 3
- assert A in parents
- assert B in parents
- assert B2 in parents
+ parent_identifiers = [(all_p.id, all_p.name) for all_p in parents]
+ assert (A.id, A.name) in parent_identifiers
+ assert (B.id, B.name) in parent_identifiers
+ assert (B2.id, B2.name) in parent_identifiers
parents = c.get_parents_recursively()
assert len(parents) == 4
- assert A in parents
- assert B in parents
- assert B2 in parents
- assert C in parents
+ parent_identifiers = [(all_p.id, all_p.name) for all_p in parents]
+ assert (A.id, A.name) in parent_identifiers
+ assert (B.id, B.name) in parent_identifiers
+ assert (B2.id, B2.name) in parent_identifiers
+ assert (C.id, C.name) in parent_identifiers
# Now do a time travel and great-grand-parentize yourself...
A.add_parent(C).update()
parents = C.get_parents_recursively()
assert len(parents) == 4
- assert A in parents
- assert B in parents
- assert B2 in parents
- assert C in parents
+ parent_identifiers = [(all_p.id, all_p.name) for all_p in parents]
+ assert (A.id, A.name) in parent_identifiers
+ assert (B.id, B.name) in parent_identifiers
+ assert (B2.id, B2.name) in parent_identifiers
+ assert (C.id, C.name) in parent_identifiers
-@pytest.mark.xfail(reason="To be fixed in server and/or pylib")
+# @pytest.mark.xfail(reason="To be fixed in server and/or pylib")
def test_entity_has_parent():
# inheritance structure:
# A
--
GitLab