Fix flaky test #1831 (#1846)

Author: ericvergnaud

tests/integration/workspace_access/test_groups.py

@@ -3,7 +3,7 @@
 from datetime import timedelta
 
 import pytest
-from databricks.sdk.errors import NotFound
+from databricks.sdk.errors import NotFound, ResourceConflict
 from databricks.sdk.retries import retried
 from databricks.sdk.service.iam import Group, ResourceMeta
 
@@ -125,7 +125,7 @@ def test_delete_ws_groups_should_not_delete_current_ws_groups(ws, make_ucx_group
     assert ws.groups.get(ws_group.id).display_name == ws_group.display_name
 
 
-@retried(on=[NotFound], timeout=timedelta(minutes=2))
+@retried(on=[NotFound, ResourceConflict], timeout=timedelta(minutes=2))
 def test_delete_ws_groups_should_not_delete_non_reflected_acc_groups(ws, make_ucx_group, sql_backend, inventory_schema):
     ws_group, _ = make_ucx_group()
     group_manager = GroupManager(sql_backend, ws, inventory_schema, [ws_group.display_name], "ucx-temp-")