[pim/akonadi-e2e-tests] tests/dav: Allow dav collection conflict test to have either server or local name

Git commit 79f2f7c02f42c3d30721f7cb1eb0a11cec8a1d2e by Dominique  MICHEL, on behalf of Dominique MICHEL.
Committed on 10/08/2026 at 14:36.
Pushed by aloeil into branch 'master'.

Allow dav collection conflict test to have either server or local name

M  +10   -8    tests/dav/test_conflict_dav.py

https://invent.kde.org/pim/akonadi-e2e-tests/-/commit/79f2f7c02f42c3d30721f7cb1eb0a11cec8a1d2e

diff --git a/tests/dav/test_conflict_dav.py b/tests/dav/test_conflict_dav.py
index 92e1615..5317e51 100644
--- a/tests/dav/test_conflict_dav.py
+++ b/tests/dav/test_conflict_dav.py
@@ -67,16 +67,14 @@ def test_offline_remove_collection_and_add_event(
     assert_all_collections_are_equals(dav_principal, groupware_resource)
 
 
[email protected](
-    reason="Akonadi bug, after conflict it takes the local name https://invent.kde.org/pim/pim-technical-roadmap/-/work_items/146",
-    strict=True,
-)
 def test_offline_rename_collection_server_and_resource(
     dav_principal: Principal, groupware_resource: DAVResource
 ) -> None:
     """
     Renaming a collection in the akonadi server, renaming the same collection under another name on the server, nothing happens
-    When the resource is set online, the collection in the akonadi server is renamed with the name given on the server
+    When the resource is set online, the collection in the akonadi server is renamed with either the local or server name
+    NOTE: The test has been modified to accept either the local or server name due to being unable to set a fixed behavior.
+        : The problem is that we can't detect if calendar properties are conflicting since calendar eTAG is not mandatory.
     """
     calendar = DavCalendarFactory.create()
     groupware_resource.synchronize()
@@ -89,7 +87,7 @@ def test_offline_rename_collection_server_and_resource(
 
     groupware_resource.set_online(False)
 
-    with AkonadiUtils.wait_for_queued_change_replay(groupware_resource):
+    with AkonadiUtils.wait_for_queued_change_replay(groupware_resource.instance):
         groupware_resource.update_collection_displayname(collection.name(), resource_new_name)
     dav_principal.calendar(calendar.name).set_properties([dav.DisplayName(server_new_name)])
 
@@ -100,8 +98,12 @@ def test_offline_rename_collection_server_and_resource(
     groupware_resource.set_online(True)
 
     assert len(groupware_resource.list_collections()) == len(initial_collections)
-    assert groupware_resource.collection_from_display_name(server_new_name)
-    assert dav_principal.calendar(server_new_name)
+    if any([cal.get_display_name() == server_new_name for cal in dav_principal.calendars()]):
+        assert dav_principal.calendar(server_new_name)
+        assert groupware_resource.collection_from_display_name(server_new_name)
+    else:
+        assert dav_principal.calendar(resource_new_name)
+        assert groupware_resource.collection_from_display_name(resource_new_name)
     assert_all_collections_are_equals(dav_principal, groupware_resource)