Expect exact number of columns

alan-turing-institute · Aug 7, 2023 · 9303c35 · 9303c35
1 parent c8e9b7a
commit 9303c35
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/data_safe_haven/administration/users/active_directory_users.py b/data_safe_haven/administration/users/active_directory_users.py
@@ -93,7 +93,7 @@ def list(self, sre_name: str | None = None) -> Sequence[ResearchUser]:  # noqa:
         expected_columns = 6
         for line in output.split("\n"):
             tokens = line.split(";")
-            if len(tokens) >= expected_columns:
+            if (n_tokens := len(tokens)) == expected_columns:
                 users.append(
                     ResearchUser(
                         email_address=tokens[4],
@@ -106,8 +106,8 @@ def list(self, sre_name: str | None = None) -> Sequence[ResearchUser]:  # noqa:
                 )
             else:
                 msg = (
-                    "Fewer than expected number of fields returned for Active Directory"
-                    f" user: {tokens}"
+                    "Unexpected number of  fields returned for Active Directory user.\n"
+                    f"Expected {expected_columns}, got {n_tokens}"
                 )
                 raise DataSafeHavenActiveDirectoryError(msg)
         return users