Skip to content

Commit 487d0b1

Browse files
lunikalunika
committed
✅(backend) fix flaky search descendants test
One test about the search descendants test was flaky. It is because the link_reach and link_role were used to test the ancestors_link_(reach|role). The properties ancestors_link_reach and ancestors_link_role should be used instead.
1 parent 9f1d454 commit 487d0b1

1 file changed

Lines changed: 15 additions & 17 deletions

File tree

‎src/backend/core/tests/documents/test_api_documents_search_descendants.py‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ def test_api_documents_search_descendants_list_anonymous_public_standalone():
6868
},
6969
{
7070
"abilities": child1.get_abilities(AnonymousUser()),
71-
"ancestors_link_reach": document.link_reach,
72-
"ancestors_link_role": document.link_role,
71+
"ancestors_link_reach": child1.ancestors_link_reach,
72+
"ancestors_link_role": child1.ancestors_link_role,
7373
"computed_link_reach": child1.computed_link_reach,
7474
"computed_link_role": child1.computed_link_role,
7575
"created_at": child1.created_at.isoformat().replace("+00:00", "Z"),
@@ -91,10 +91,8 @@ def test_api_documents_search_descendants_list_anonymous_public_standalone():
9191
},
9292
{
9393
"abilities": grand_child.get_abilities(AnonymousUser()),
94-
"ancestors_link_reach": document.link_reach,
95-
"ancestors_link_role": document.link_role
96-
if (child1.link_reach == "public" and child1.link_role == "editor")
97-
else document.link_role,
94+
"ancestors_link_reach": grand_child.ancestors_link_reach,
95+
"ancestors_link_role": grand_child.ancestors_link_role,
9896
"computed_link_reach": "public",
9997
"computed_link_role": grand_child.computed_link_role,
10098
"created_at": grand_child.created_at.isoformat().replace("+00:00", "Z"),
@@ -116,8 +114,8 @@ def test_api_documents_search_descendants_list_anonymous_public_standalone():
116114
},
117115
{
118116
"abilities": child2.get_abilities(AnonymousUser()),
119-
"ancestors_link_reach": document.link_reach,
120-
"ancestors_link_role": document.link_role,
117+
"ancestors_link_reach": child2.ancestors_link_reach,
118+
"ancestors_link_role": child2.ancestors_link_role,
121119
"computed_link_reach": "public",
122120
"computed_link_role": child2.computed_link_role,
123121
"created_at": child2.created_at.isoformat().replace("+00:00", "Z"),
@@ -180,7 +178,7 @@ def test_api_documents_search_descendants_list_anonymous_public_parent():
180178
# the search should include the parent document itself
181179
"abilities": document.get_abilities(AnonymousUser()),
182180
"ancestors_link_reach": "public",
183-
"ancestors_link_role": grand_parent.link_role,
181+
"ancestors_link_role": document.ancestors_link_role,
184182
"computed_link_reach": document.computed_link_reach,
185183
"computed_link_role": document.computed_link_role,
186184
"created_at": document.created_at.isoformat().replace("+00:00", "Z"),
@@ -203,7 +201,7 @@ def test_api_documents_search_descendants_list_anonymous_public_parent():
203201
{
204202
"abilities": child1.get_abilities(AnonymousUser()),
205203
"ancestors_link_reach": "public",
206-
"ancestors_link_role": grand_parent.link_role,
204+
"ancestors_link_role": child1.ancestors_link_role,
207205
"computed_link_reach": child1.computed_link_reach,
208206
"computed_link_role": child1.computed_link_role,
209207
"created_at": child1.created_at.isoformat().replace("+00:00", "Z"),
@@ -249,7 +247,7 @@ def test_api_documents_search_descendants_list_anonymous_public_parent():
249247
{
250248
"abilities": child2.get_abilities(AnonymousUser()),
251249
"ancestors_link_reach": "public",
252-
"ancestors_link_role": grand_parent.link_role,
250+
"ancestors_link_role": child2.ancestors_link_role,
253251
"computed_link_reach": "public",
254252
"computed_link_role": child2.computed_link_role,
255253
"created_at": child2.created_at.isoformat().replace("+00:00", "Z"),
@@ -327,7 +325,7 @@ def test_api_documents_search_descendants_list_authenticated_unrelated_public_or
327325
{
328326
"abilities": child1.get_abilities(user),
329327
"ancestors_link_reach": reach,
330-
"ancestors_link_role": document.link_role,
328+
"ancestors_link_role": child1.ancestors_link_role,
331329
"computed_link_reach": child1.computed_link_reach,
332330
"computed_link_role": child1.computed_link_role,
333331
"created_at": child1.created_at.isoformat().replace("+00:00", "Z"),
@@ -350,7 +348,7 @@ def test_api_documents_search_descendants_list_authenticated_unrelated_public_or
350348
{
351349
"abilities": grand_child.get_abilities(user),
352350
"ancestors_link_reach": reach,
353-
"ancestors_link_role": document.link_role,
351+
"ancestors_link_role": grand_child.ancestors_link_role,
354352
"computed_link_reach": grand_child.computed_link_reach,
355353
"computed_link_role": grand_child.computed_link_role,
356354
"created_at": grand_child.created_at.isoformat().replace("+00:00", "Z"),
@@ -373,7 +371,7 @@ def test_api_documents_search_descendants_list_authenticated_unrelated_public_or
373371
{
374372
"abilities": child2.get_abilities(user),
375373
"ancestors_link_reach": reach,
376-
"ancestors_link_role": document.link_role,
374+
"ancestors_link_role": child2.ancestors_link_role,
377375
"computed_link_reach": child2.computed_link_reach,
378376
"computed_link_role": child2.computed_link_role,
379377
"created_at": child2.created_at.isoformat().replace("+00:00", "Z"),
@@ -437,7 +435,7 @@ def test_api_documents_search_descendants_list_authenticated_public_or_authentic
437435
{
438436
"abilities": child1.get_abilities(user),
439437
"ancestors_link_reach": reach,
440-
"ancestors_link_role": grand_parent.link_role,
438+
"ancestors_link_role": child1.ancestors_link_role,
441439
"computed_link_reach": child1.computed_link_reach,
442440
"computed_link_role": child1.computed_link_role,
443441
"created_at": child1.created_at.isoformat().replace("+00:00", "Z"),
@@ -460,7 +458,7 @@ def test_api_documents_search_descendants_list_authenticated_public_or_authentic
460458
{
461459
"abilities": grand_child.get_abilities(user),
462460
"ancestors_link_reach": reach,
463-
"ancestors_link_role": grand_parent.link_role,
461+
"ancestors_link_role": grand_child.ancestors_link_role,
464462
"computed_link_reach": grand_child.computed_link_reach,
465463
"computed_link_role": grand_child.computed_link_role,
466464
"created_at": grand_child.created_at.isoformat().replace("+00:00", "Z"),
@@ -483,7 +481,7 @@ def test_api_documents_search_descendants_list_authenticated_public_or_authentic
483481
{
484482
"abilities": child2.get_abilities(user),
485483
"ancestors_link_reach": reach,
486-
"ancestors_link_role": grand_parent.link_role,
484+
"ancestors_link_role": child2.ancestors_link_role,
487485
"computed_link_reach": child2.computed_link_reach,
488486
"computed_link_role": child2.computed_link_role,
489487
"created_at": child2.created_at.isoformat().replace("+00:00", "Z"),

0 commit comments

Comments
 (0)