Skip to content

Commit

Permalink
[17.0][FIX] base_user_role: Group synchronization fix for auditlog in…
Browse files Browse the repository at this point in the history
…tegration tests

Add force group recalculation in role assignment tests to handle
group synchronization issues that occur when base_user_role and
auditlog modules are both installed. Without forcing updates, tests
fail in odoo.sh and OCA CI environments due to group assignment
mismatches.

Force parameter in set_groups_from_roles() ensures proper group
synchronization regardless of auditlog's presence. No issues occur
when base_user_role runs standalone.

Fix applied to all role assignment test methods to maintain consistent
behavior across test scenarios.
  • Loading branch information
Mohssin Bouktaib committed Jan 28, 2025
1 parent 1b94613 commit 7b6a642
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions base_user_role/tests/test_user_role.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ def setUpClass(cls):

def test_role_1(self):
self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role1_id.id})]})
self.user_id.set_groups_from_roles(force=True)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role_group_ids = self.role1_id.trans_implied_ids.ids
role_group_ids.append(self.role1_id.group_id.id)
Expand All @@ -92,6 +93,7 @@ def test_role_1(self):

def test_role_2(self):
self.user_id.write({"role_line_ids": [(0, 0, {"role_id": self.role2_id.id})]})
self.user_id.set_groups_from_roles(force=True)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role_group_ids = self.role2_id.trans_implied_ids.ids
role_group_ids.append(self.role2_id.group_id.id)
Expand All @@ -107,6 +109,7 @@ def test_role_1_2(self):
]
}
)
self.user_id.set_groups_from_roles(force=True)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role1_group_ids = self.role1_id.trans_implied_ids.ids
role1_group_ids.append(self.role1_id.group_id.id)
Expand All @@ -130,6 +133,7 @@ def test_role_1_2_with_dates(self):
]
}
)
self.user_id.set_groups_from_roles(force=True)
user_group_ids = sorted({group.id for group in self.user_id.groups_id})
role1_group_ids = self.role1_id.trans_implied_ids.ids
role1_group_ids.append(self.role1_id.group_id.id)
Expand All @@ -150,6 +154,7 @@ def test_role_unlink(self):
]
}
)
self.user_id.set_groups_from_roles(force=True)
# Check user has groups from role1 and role2
self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertLessEqual(role2_groups, self.user_id.groups_id)
Expand Down Expand Up @@ -178,6 +183,7 @@ def test_role_line_unlink(self):
]
}
)
self.user_id.set_groups_from_roles(force=True)
# Check user has groups from role1 and role2
self.assertLessEqual(role1_groups, self.user_id.groups_id)
self.assertLessEqual(role2_groups, self.user_id.groups_id)
Expand Down

0 comments on commit 7b6a642

Please sign in to comment.