account for mismatched uid due to test server process

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

Author: BeryJu

tests/e2e/test_provider_ldap.py

@@ -19,9 +19,28 @@
 from tests.live import ChannelsE2ETestCase
 
 
+def clean_response(response):
+    # Remove raw_attributes to make checking easier
+    for obj in response:
+        del obj["raw_attributes"]
+        del obj["raw_dn"]
+        obj["attributes"] = dict(obj["attributes"])
+        obj["attributes"].pop("uid", None)
+    return response
+
+
 class TestProviderLDAP(ChannelsE2ETestCase):
     """LDAP and Outpost e2e tests"""
 
+    def assert_list_dict_equal(self, expected: list[dict], actual: list[dict], match_key="dn"):
+        """Assert a list of dictionaries is identical, ignoring the ordering of items"""
+        self.assertEqual(len(expected), len(actual))
+        for res_item in actual:
+            all_matching = [x for x in expected if x[match_key] == res_item[match_key]]
+            self.assertEqual(len(all_matching), 1)
+            matching = all_matching[0]
+            self.assertDictEqual(res_item, matching)
+
     def start_ldap(self, outpost: Outpost):
         """Start ldap container based on outpost created"""
         self.run_container(
@@ -211,20 +230,14 @@ def test_ldap_bind_search(self):
             search_scope=SUBTREE,
             attributes=[ALL_ATTRIBUTES, ALL_OPERATIONAL_ATTRIBUTES],
         )
-        response: list = _connection.response
-        # Remove raw_attributes to make checking easier
-        for obj in response:
-            del obj["raw_attributes"]
-            del obj["raw_dn"]
-            obj["attributes"] = dict(obj["attributes"])
+        response = clean_response(_connection.response)
         o_user = outpost.user
         expected = [
             {
                 "dn": f"cn={o_user.username},ou=users,dc=ldap,dc=goauthentik,dc=io",
                 "attributes": {
                     "cn": o_user.username,
                     "sAMAccountName": o_user.username,
-                    "uid": o_user.uid,
                     "name": o_user.name,
                     "displayName": o_user.name,
                     "sn": o_user.name,
@@ -255,7 +268,6 @@ def test_ldap_bind_search(self):
                 "attributes": {
                     "cn": embedded_account.username,
                     "sAMAccountName": embedded_account.username,
-                    "uid": embedded_account.uid,
                     "name": embedded_account.name,
                     "displayName": embedded_account.name,
                     "sn": embedded_account.name,
@@ -286,7 +298,6 @@ def test_ldap_bind_search(self):
                 "attributes": {
                     "cn": self.user.username,
                     "sAMAccountName": self.user.username,
-                    "uid": self.user.uid,
                     "name": self.user.name,
                     "displayName": self.user.name,
                     "sn": self.user.name,
@@ -355,19 +366,13 @@ def test_ldap_bind_search_no_perms(self):
             search_scope=SUBTREE,
             attributes=[ALL_ATTRIBUTES, ALL_OPERATIONAL_ATTRIBUTES],
         )
-        response: list = _connection.response
-        # Remove raw_attributes to make checking easier
-        for obj in response:
-            del obj["raw_attributes"]
-            del obj["raw_dn"]
-            obj["attributes"] = dict(obj["attributes"])
+        response = clean_response(_connection.response)
         expected = [
             {
                 "dn": f"cn={user.username},ou=users,dc=ldap,dc=goauthentik,dc=io",
                 "attributes": {
                     "cn": user.username,
                     "sAMAccountName": user.username,
-                    "uid": user.uid,
                     "name": user.name,
                     "displayName": user.name,
                     "sn": user.name,
@@ -399,15 +404,6 @@ def test_ldap_bind_search_no_perms(self):
         ]
         self.assert_list_dict_equal(expected, response)
 
-    def assert_list_dict_equal(self, expected: list[dict], actual: list[dict], match_key="dn"):
-        """Assert a list of dictionaries is identical, ignoring the ordering of items"""
-        self.assertEqual(len(expected), len(actual))
-        for res_item in actual:
-            all_matching = [x for x in expected if x[match_key] == res_item[match_key]]
-            self.assertEqual(len(all_matching), 1)
-            matching = all_matching[0]
-            self.assertDictEqual(res_item, matching)
-
     @retry()
     @apply_blueprint(
         "default/flow-default-authentication-flow.yaml",
@@ -471,11 +467,8 @@ def test_ldap_search_attrs_filter(self):
             search_scope=SUBTREE,
             attributes=["cn"],
         )
-        response: list = _connection.response
-        # Remove raw_attributes to make checking easier
-        for obj in response:
-            del obj["raw_attributes"]
-            del obj["raw_dn"]
+        response = clean_response(_connection.response)
+
         o_user = outpost.user
         self.assert_list_dict_equal(
             [