Skip to content

Commit 5fb6a84

Browse files
committed
don't raise exception for primary group failure
1 parent 3d577ab commit 5fb6a84

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

tests/test_sign_engine.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -263,18 +263,18 @@ def test_resolve_primary_group_and_group_admin_state_umg_true(example_engine, mo
263263
assert 'group2' in groups_to_update
264264
assert groups_to_update['group2'].isPrimaryGroup is True
265265

266-
def test_resolve_primary_group_and_group_admin_state_no_primary_group(example_engine, mock_data_for_update):
267-
example_engine.resolve_primary_group = MagicMock(return_value=None)
268-
with pytest.raises(AssertionException, match="Can't identify a primary group for user '[email protected]'"):
269-
example_engine.resolvePrimaryGroupAndGroupAdminState(
270-
is_umg=True,
271-
groups_to_update=mock_data_for_update['groups_to_update'],
272-
assigned_groups=mock_data_for_update['assigned_groups'],
273-
desired_groups=mock_data_for_update['desired_groups'],
274-
admin_groups=mock_data_for_update['admin_groups'],
275-
directory_user=mock_data_for_update['directory_user'],
276-
sign_user=mock_data_for_update['sign_user']
277-
)
266+
# def test_resolve_primary_group_and_group_admin_state_no_primary_group(example_engine, mock_data_for_update):
267+
# example_engine.resolve_primary_group = MagicMock(return_value=None)
268+
# with pytest.raises(AssertionException, match="Can't identify a primary group for user '[email protected]'"):
269+
# example_engine.resolvePrimaryGroupAndGroupAdminState(
270+
# is_umg=True,
271+
# groups_to_update=mock_data_for_update['groups_to_update'],
272+
# assigned_groups=mock_data_for_update['assigned_groups'],
273+
# desired_groups=mock_data_for_update['desired_groups'],
274+
# admin_groups=mock_data_for_update['admin_groups'],
275+
# directory_user=mock_data_for_update['directory_user'],
276+
# sign_user=mock_data_for_update['sign_user']
277+
# )
278278

279279
def test_resolve_primary_group_and_group_admin_state_update_group_admin(example_engine, mock_data_for_update):
280280
groups_to_update = example_engine.resolvePrimaryGroupAndGroupAdminState(

user_sync/engine/sign.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,8 @@ def resolvePrimaryGroupAndGroupAdminState(self, is_umg, groups_to_update, assign
345345
current_pg = None
346346

347347
if desired_pg is None:
348-
raise AssertionException(f"Can't identify a primary group for user '{sign_user.email}'")
348+
self.logger.error(f"Can't identify a primary group for user '{sign_user.email}'")
349+
return
349350

350351
if current_pg is None or desired_pg.lower() != current_pg:
351352
if desired_pg.lower() in groups_to_update.keys():
@@ -577,7 +578,8 @@ def insert_new_users(self, org_name: str, sign_connector: SignConnector, directo
577578
if is_umg:
578579
primary_group = self.resolve_primary_group(groups_to_assign.keys())
579580
if primary_group is None:
580-
raise AssertionException(f"Can't identify a primary group for user '{new_user.email}'")
581+
self.logger.error(f"Can't identify a primary group for user '{new_user.email}'")
582+
return
581583
self.logger.debug(f"Primary group of '{new_user.email}' is '{primary_group}'")
582584
groups_to_assign[primary_group.lower()].isPrimaryGroup = True
583585
else:

0 commit comments

Comments
 (0)