Skip to content

Commit 10c87cb

Browse files
providers/scim: fix migrations and linting
1 parent 86990c5 commit 10c87cb

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

authentik/providers/scim/migrations/0015_remove_scimprovider_filter_group_and_more.py

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("authentik_core", "0043_alter_group_options"),
109
("authentik_providers_scim", "0014_scimprovider_migrate_filter_groups"),
1110
]
1211

authentik/providers/scim/tests/test_filter_groups.py

+21-14
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,7 @@ def setUp(self) -> None:
6464
self.users_in_any_filter_group = list(set(self.users_in_group1 + self.users_in_group2))
6565
self.all_users = list(self.users.values())
6666
self.users_not_in_filter_groups = [
67-
user for user in self.users.values()
68-
if user not in self.users_in_any_filter_group
67+
user for user in self.users.values() if user not in self.users_in_any_filter_group
6968
]
7069

7170
# Assign users to groups
@@ -87,12 +86,12 @@ def test_no_filter_groups(self):
8786
self.assertGreaterEqual(groups.count(), len(self.all_groups))
8887

8988
# Verify all users are included
90-
user_pks = list(users.values_list('pk', flat=True))
89+
user_pks = list(users.values_list("pk", flat=True))
9190
for user in self.all_users:
9291
self.assertIn(user.pk, user_pks)
9392

9493
# Verify all test groups are included
95-
group_pks = list(groups.values_list('pk', flat=True))
94+
group_pks = list(groups.values_list("pk", flat=True))
9695
for group in self.all_groups:
9796
self.assertIn(group.pk, group_pks)
9897

@@ -108,17 +107,17 @@ def test_single_filter_group(self):
108107
self.assertEqual(groups.count(), 1)
109108

110109
# Verify only users in filter_group1 are included
111-
user_pks = set(users.values_list('pk', flat=True))
110+
user_pks = set(users.values_list("pk", flat=True))
112111
for user in self.all_users:
113-
if(user in self.users_in_group1):
112+
if user in self.users_in_group1:
114113
self.assertIn(user.pk, user_pks)
115114
else:
116115
self.assertNotIn(user.pk, user_pks)
117116

118117
# Verify only filter_group1 is included
119-
group_pks = list(groups.values_list('pk', flat=True))
118+
group_pks = list(groups.values_list("pk", flat=True))
120119
for group in self.all_groups:
121-
if(group == self.filter_group1):
120+
if group == self.filter_group1:
122121
self.assertIn(group.pk, group_pks)
123122
else:
124123
self.assertNotIn(group.pk, group_pks)
@@ -135,17 +134,17 @@ def test_multiple_filter_groups(self):
135134
self.assertEqual(groups.count(), len(self.filter_groups))
136135

137136
# Verify users in either filter_group1 or filter_group2 are included
138-
user_pks = set(users.values_list('pk', flat=True))
137+
user_pks = set(users.values_list("pk", flat=True))
139138
for user in self.all_users:
140-
if(user in self.users_in_any_filter_group):
139+
if user in self.users_in_any_filter_group:
141140
self.assertIn(user.pk, user_pks)
142141
else:
143142
self.assertNotIn(user.pk, user_pks)
144143

145144
# Verify only the filter groups are included
146-
group_pks = list(groups.values_list('pk', flat=True))
145+
group_pks = list(groups.values_list("pk", flat=True))
147146
for group in self.all_groups:
148-
if(group in self.filter_groups):
147+
if group in self.filter_groups:
149148
self.assertIn(group.pk, group_pks)
150149
else:
151150
self.assertNotIn(group.pk, group_pks)
@@ -214,6 +213,14 @@ def test_sync_with_filter_groups(self, mock: Mocker):
214213
group_posts += 1
215214

216215
# Verify number of synchronized users
217-
self.assertEqual(user_posts, len(self.users_in_any_filter_group), f"Expected {len(self.users_in_any_filter_group)} users to be synchronized")
216+
self.assertEqual(
217+
user_posts,
218+
len(self.users_in_any_filter_group),
219+
f"Expected {len(self.users_in_any_filter_group)} users to be synchronized",
220+
)
218221
# Verify number of synchronized groups
219-
self.assertEqual(group_posts, len(self.filter_groups), f"Expected {len(self.users_in_any_filter_group)} groups to be synchronized")
222+
self.assertEqual(
223+
group_posts,
224+
len(self.filter_groups),
225+
f"Expected {len(self.users_in_any_filter_group)} groups to be synchronized",
226+
)

0 commit comments

Comments
 (0)