refactor: sweep the platform-and-sign-in epic

Split load_config into per-section readers, use contextlib.suppress and a single condition where ruff asked, remove stale noqa comments, add the SIM and RUF100 rules, share the sign_in test helper, align AD-6 with the code and record the remaining deferred findings.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01N3t4WL7bd9bdHHNjEsxzqC

_bmad-output/architecture/architecture-ping-mee-self-service-platform-2026-10-15/ARCHITECTURE-SPINE.md

@@ -65,7 +65,7 @@ Arrows are the only allowed dependency direction. Views never call adapters. Fea
 ### AD-6 — Sessions are server-side with a kill-by-user primitive
 - **Binds:** FR-3, FR-7, FR-11
 - **Prevents:** sessions that cannot be ended; mismatched idle and absolute limits
-- **Rule:** sessions live in the database with the username in its own column. Idle limit 1 h, absolute limit 4 h, both settings. `end_sessions(username, except_current=bool)` is the only way to end sessions and is used by password change, undo, sign-out and disabled-account detection. Cookies are secure, HttpOnly and SameSite=Lax.
+- **Rule:** sessions live in the database with the username in its own column. Idle limit 1 h, absolute limit 4 h, both settings. `end_sessions(user, except_session_key=None)` is the only way to end sessions and is used by password change, undo, sign-out and disabled-account detection. Cookies are secure, HttpOnly and SameSite=Lax.
 
 ### AD-7 — Throttle before any outbound call; client IP from a trusted proxy only
 - **Binds:** FR-4, FR-6, FR-10, FR-11, FR-12

_bmad-output/initiative-ping-mee-portal/deferred-work.md

@@ -2,5 +2,5 @@
   summary: ARCHITECTURE-SPINE AD-2 says the service account's read rights are limited to a list, but Active Directory gives authenticated users broad read by default, so the statement is not enforced by the test-environment setup.
   evidence: The setup script grants only write rights and the Change Password right; read access is the default. Either soften AD-2 ("needs no more than this list") or enforce it with deny entries; decide when the architecture is next updated.
 - source_plan: `_bmad-output/initiative-ping-mee-portal/epic-platform-and-sign-in/story-audit-throttle-and-session-foundations-plan.md`
-  summary: ARCHITECTURE-SPINE AD-6 names `end_sessions(username, except_current=bool)`, but the built function is `end_sessions(user, except_session_key=None)`.
+  summary: Concurrent writers on the throttle counters are not tested.
-  evidence: A function that keeps the current session needs that session's key; a boolean cannot say which one. Reword AD-6 to match when the architecture is next updated; callers use the key form.
+  evidence: The test database is SQLite in memory with a shared cache, which answers "table is locked" to a second writer at once, so a threaded test fails for reasons that say nothing about production (a WAL file database with a 20 s busy timeout and IMMEDIATE transactions). A real test needs a file database; tried and dropped in the refactor sweep.

_bmad-output/initiative-ping-mee-portal/epic-platform-and-sign-in/story-refactor-sweep-plan.md

@@ -0,0 +1,39 @@
+---
+title: 'Refactor sweep'
+type: 'chore'
+ticket: '8'
+created: '2026-10-18'
+status: 'built'
+baseline_revision: '20510a7'
+route: 'full'
+route_source: 'auto'
+risk: 'low'
+review: 'quick'
+review_source: 'pinned'
+---
+
+## Intent
+
+**Problem:** Entries 1 to 7 left deferred findings and some code that grew in passes.
+
+**Approach:** Behaviour-preserving clean-ups backed by the existing tests; nothing new for users. Scope pushed out of another story is a new story, not part of this one.
+
+## Triage of the epic's findings
+
+| # | Finding | Source | Verdict | Result |
+|---|---------|--------|---------|--------|
+| 1 | `load_config` has 98 statements and 30 branches | sweep (ruff C901, PLR0915) | patch | Split into `_Reader` and one function per section (core, debug, trusted proxies, directory, OIDC, SMTP); `load_config` is 10 lines. Same messages, same tests. |
+| 2 | `try/except/pass` around `unbind_s` twice; a nested `if` in the key cache | sweep (ruff SIM) | patch | `contextlib.suppress`; one condition. |
+| 3 | Unused `noqa` comments | sweep (ruff RUF100) | patch | Removed the stale ones; the two that are still needed (S107, S310) stay. |
+| 4 | Lint rules that would have caught 2 and 3 are not on | sweep | patch | `SIM` and `RUF100` added to the ruff rules. |
+| 5 | `sign_in` test helper lived in `test_signin.py` and was imported by another test module | sweep | patch | Moved to `portal/tests/helpers.py`. |
+| 6 | AD-6 names `end_sessions(username, except_current=bool)`; the code has `end_sessions(user, except_session_key=None)` | deferred from entry 3 | patch (document) | AD-6 reworded to match the code. |
+| 7 | AD-2 says the service account's read rights are limited to a list; Active Directory gives authenticated users broad read | deferred from entry 2 | defer | Needs the owner's decision: soften the sentence or enforce with deny entries. Stays in `deferred-work.md`. |
+| 8 | Concurrent writers on the throttle counters are not tested | deferred from entry 3 | defer | A threaded test fails on the in-memory test database for reasons unrelated to production; tried and dropped. Recorded in `deferred-work.md`. |
+| 9 | Dead code | sweep (vulture) | none | Everything flagged is a framework hook, a setting, or an interface used by later epics. |
+| 10 | Docker build and browser look of entries 6 and 7 | "not verified" in the plans | closed | Checked on the Linux host by the owner (build, shell, test e-mail). |
+
+## Implementation Notes
+
+- `pytest` 319 passed, 6 skipped; `ruff check` clean with the two new rule sets.
+- Nothing outside the epic's code was touched except the AD-6 sentence in the spine and `deferred-work.md`.

docker/healthcheck.py

@@ -6,11 +6,11 @@ import urllib.request
 
 hosts = [h.strip() for h in os.environ.get("ALLOWED_HOSTS", "").split(",") if h.strip()]
 host = hosts[0].lstrip(".") if hosts and hosts[0] != "*" else "localhost"
-request = urllib.request.Request(  # noqa: S310
+request = urllib.request.Request(
     "http://127.0.0.1:8000/healthz", headers={"Host": host}
 )
 try:
     with urllib.request.urlopen(request, timeout=3) as response:  # noqa: S310
         sys.exit(0 if response.status == 200 else 1)
-except Exception:  # noqa: BLE001
+except Exception:
     sys.exit(1)

portal/adapters/directory/ldap_directory.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import logging
 import re
-from contextlib import contextmanager
+from contextlib import contextmanager, suppress
 from dataclasses import replace
 from datetime import UTC, datetime, timedelta
 from types import ModuleType
@@ -105,10 +105,8 @@ class LdapDirectory:
             logger.warning("Directory request failed: %s", type(exc).__name__)
             raise DirectoryUnavailable("The directory is not available") from exc
         finally:
-            try:
+            with suppress(self._ldap.LDAPError):
                 conn.unbind_s()
-            except self._ldap.LDAPError:
-                pass
 
     def _search(self, conn, base: str, scope: int, flt: str, attrs: tuple[str, ...]):
         found = conn.search_s(base, scope, flt, list(attrs))
@@ -203,10 +201,8 @@ class LdapDirectory:
             logger.warning("Directory request failed: %s", type(exc).__name__)
             raise DirectoryUnavailable("The directory is not available") from exc
         finally:
-            try:
+            with suppress(ldap.LDAPError):
                 user_conn.unbind_s()
-            except ldap.LDAPError:
-                pass
 
     def password_policy(self, sam: str) -> PasswordPolicy:
         ldap = self._ldap

portal/adapters/idp/oidc.py

@@ -89,8 +89,8 @@ class OidcIdp:
 
     def _keyset(self, session: OAuth2Session, jwks_uri: str, *, refresh: bool) -> KeySet:
         with self._lock:
-            if self._keys is not None and not refresh:
+            fresh = self._clock() - self._keys_at < CACHE_SECONDS
-                if self._clock() - self._keys_at < CACHE_SECONDS:
+            if self._keys is not None and not refresh and fresh:
                 return self._keys
         try:
             keys = KeySet.import_key_set(self._get_json(session, jwks_uri))

portal/config/env.py

@@ -82,138 +82,113 @@ class Config:
     smtp: SmtpConfig
 
 
-def load_config(environ: Mapping[str, str]) -> Config:
+class _Reader:
-    problems: list[str] = []
+    """Reads variables and collects every problem instead of stopping at the first."""
 
-    def raw(name: str) -> str | None:
+    def __init__(self, environ: Mapping[str, str]) -> None:
-        value = environ.get(name)
+        self._environ = environ
+        self.problems: list[str] = []
+
+    def raw(self, name: str) -> str | None:
+        value = self._environ.get(name)
         if value is None or value.strip() == "":
             return None
         return value.strip()
 
-    secret_key = raw("SECRET_KEY")
+    def required(self, name: str, rule: str) -> str:
-    if secret_key is None:
+        value = self.raw(name)
-        problems.append("SECRET_KEY: required")
+        if value is None:
-    elif len(secret_key) < MIN_SECRET_KEY_LENGTH:
+            self.problems.append(f"{name}: required, {rule}")
-        problems.append(f"SECRET_KEY: must be at least {MIN_SECRET_KEY_LENGTH} characters")
+            return ""
+        return value
 
-    hosts_raw = raw("ALLOWED_HOSTS")
+    def problem(self, message: str) -> None:
-    allowed_hosts: list[str] = []
+        self.problems.append(message)
-    if hosts_raw is None:
-        problems.append("ALLOWED_HOSTS: required, comma-separated host names")
-    else:
-        allowed_hosts = [h.strip() for h in hosts_raw.split(",") if h.strip()]
-        if not allowed_hosts:
-            problems.append("ALLOWED_HOSTS: must contain at least one host name")
 
-    data_dir = Path(raw("DATA_DIR") or "/data")
-    if not data_dir.is_dir():
-        problems.append("DATA_DIR: must be an existing directory")
-    else:
-        data_dir = data_dir.resolve()
 
-    debug = False
+def _read_debug(r: _Reader) -> bool:
-    debug_raw = raw("DEBUG")
+    value = r.raw("DEBUG")
-    if debug_raw is not None:
+    if value is None:
-        if debug_raw.lower() in _TRUE:
+        return False
-            debug = True
+    if value.lower() in _TRUE:
-        elif debug_raw.lower() not in _FALSE:
+        return True
-            problems.append("DEBUG: must be true or false")
+    if value.lower() not in _FALSE:
+        r.problem("DEBUG: must be true or false")
+    return False
 
+
+def _read_trusted_proxies(r: _Reader) -> list[str]:
     proxies: list[str] = []
-    proxies_raw = raw("TRUSTED_PROXIES")
+    value = r.raw("TRUSTED_PROXIES")
-    if proxies_raw is not None:
+    for item in (value or "").split(","):
-        for item in proxies_raw.split(","):
         item = item.strip()
         if not item:
             continue
         try:
             ipaddress.ip_network(item, strict=False)
         except ValueError:
-                problems.append("TRUSTED_PROXIES: must be comma-separated IP addresses or networks")
+            r.problem("TRUSTED_PROXIES: must be comma-separated IP addresses or networks")
             break
         proxies.append(item)
+    return proxies
 
-    log_level = (raw("LOG_LEVEL") or "INFO").upper()
+
+def _read_core(r: _Reader) -> dict:
+    secret_key = r.raw("SECRET_KEY")
+    if secret_key is None:
+        r.problem("SECRET_KEY: required")
+    elif len(secret_key) < MIN_SECRET_KEY_LENGTH:
+        r.problem(f"SECRET_KEY: must be at least {MIN_SECRET_KEY_LENGTH} characters")
+
+    hosts_raw = r.raw("ALLOWED_HOSTS")
+    allowed_hosts: list[str] = []
+    if hosts_raw is None:
+        r.problem("ALLOWED_HOSTS: required, comma-separated host names")
+    else:
+        allowed_hosts = [h.strip() for h in hosts_raw.split(",") if h.strip()]
+        if not allowed_hosts:
+            r.problem("ALLOWED_HOSTS: must contain at least one host name")
+
+    data_dir = Path(r.raw("DATA_DIR") or "/data")
+    if not data_dir.is_dir():
+        r.problem("DATA_DIR: must be an existing directory")
+    else:
+        data_dir = data_dir.resolve()
+
+    log_level = (r.raw("LOG_LEVEL") or "INFO").upper()
     if log_level not in LOG_LEVELS:
-        problems.append(f"LOG_LEVEL: must be one of {', '.join(LOG_LEVELS)}")
+        r.problem(f"LOG_LEVEL: must be one of {', '.join(LOG_LEVELS)}")
 
-    timezone = raw("DEFAULT_TIMEZONE") or "Europe/Berlin"
+    timezone = r.raw("DEFAULT_TIMEZONE") or "Europe/Berlin"
     try:
         ZoneInfo(timezone)
     except (ZoneInfoNotFoundError, ValueError, OSError):
-        problems.append("DEFAULT_TIMEZONE: must be a valid IANA time zone name")
+        r.problem("DEFAULT_TIMEZONE: must be a valid IANA time zone name")
 
-    def required(name: str, rule: str) -> str:
+    return {
-        value = raw(name)
+        "secret_key": secret_key or "",
-        if value is None:
+        "allowed_hosts": allowed_hosts,
-            problems.append(f"{name}: required, {rule}")
+        "data_dir": data_dir,
-            return ""
+        "debug": _read_debug(r),
-        return value
+        "trusted_proxies": _read_trusted_proxies(r),
+        "log_level": log_level,
+        "default_timezone": timezone,
+    }
 
-    server = required("LDAP_SERVER", "host name of the directory server, with optional :port")
+
+def _read_directory(r: _Reader) -> DirectoryConfig:
+    server = r.required("LDAP_SERVER", "host name of the directory server, with optional :port")
     if "://" in server or "/" in server:
-        problems.append("LDAP_SERVER: must be a host name, not a URL (LDAPS is always used)")
+        r.problem("LDAP_SERVER: must be a host name, not a URL (LDAPS is always used)")
-    user_ou_dn = required("LDAP_USER_OU_DN", "distinguished name of the OU that holds the users")
+    user_ou_dn = r.required("LDAP_USER_OU_DN", "distinguished name of the OU that holds the users")
-    bind_dn = required("LDAP_BIND_DN", "service account distinguished name or user principal name")
+    bind_dn = r.required("LDAP_BIND_DN", "service account distinguished name or principal name")
-    bind_password = required("LDAP_BIND_PASSWORD", "password of the service account")
+    bind_password = r.required("LDAP_BIND_PASSWORD", "password of the service account")
-    publisher_group_dn = required("LDAP_PUBLISHER_GROUP_DN", "distinguished name of the group")
+    publisher_group_dn = r.required("LDAP_PUBLISHER_GROUP_DN", "distinguished name of the group")
-    admin_group_dn = required("LDAP_ADMIN_GROUP_DN", "distinguished name of the group")
+    admin_group_dn = r.required("LDAP_ADMIN_GROUP_DN", "distinguished name of the group")
-    ca_file = Path(required("LDAP_CA_FILE", "path of the PEM file with the CA chain"))
+    ca_file = Path(r.required("LDAP_CA_FILE", "path of the PEM file with the CA chain"))
-    if raw("LDAP_CA_FILE") is not None and not ca_file.is_file():
+    if r.raw("LDAP_CA_FILE") is not None and not ca_file.is_file():
-        problems.append("LDAP_CA_FILE: must be an existing file")
+        r.problem("LDAP_CA_FILE: must be an existing file")
-
+    return DirectoryConfig(
-    issuer = required("OIDC_ISSUER", "issuer address from the provider's OpenID configuration")
-    client_id = required("OIDC_CLIENT_ID", "client ID of the provider's application")
-    client_secret = required("OIDC_CLIENT_SECRET", "client secret of the provider's application")
-    base_url = required("PUBLIC_BASE_URL", "address users reach the portal at, e.g. https://host")
-    base_url = base_url.rstrip("/")
-    if issuer and urlsplit(issuer).scheme != "https":
-        problems.append("OIDC_ISSUER: must be an https address")
-    if base_url:
-        parts = urlsplit(base_url)
-        allowed = ("https", "http") if debug else ("https",)
-        if parts.scheme not in allowed or not parts.netloc or parts.path or parts.query:
-            problems.append("PUBLIC_BASE_URL: must be an https origin such as https://host")
-
-    smtp_host = required("SMTP_HOST", "host name of the mail server")
-    if "://" in smtp_host or "/" in smtp_host or ":" in smtp_host:
-        problems.append("SMTP_HOST: must be a host name only; set the port in SMTP_PORT")
-    smtp_security = (raw("SMTP_SECURITY") or "starttls").lower()
-    if smtp_security not in SMTP_SECURITY_MODES:
-        problems.append(f"SMTP_SECURITY: must be one of {', '.join(SMTP_SECURITY_MODES)}")
-        smtp_security = "starttls"
-    smtp_port = SMTP_DEFAULT_PORTS[smtp_security]
-    port_raw = raw("SMTP_PORT")
-    if port_raw is not None:
-        if port_raw.isdigit() and 0 < int(port_raw) < 65536:
-            smtp_port = int(port_raw)
-        else:
-            problems.append("SMTP_PORT: must be a port number from 1 to 65535")
-    smtp_username = required("SMTP_USERNAME", "user name of the mailbox")
-    smtp_password = required("SMTP_PASSWORD", "password of the mailbox")
-    sender = required("MAIL_FROM", "sender address of the portal's e-mails")
-    address = parseaddr(sender)[1]
-    if sender and (
-        address.count("@") != 1
-        or any(c in sender for c in chr(13) + chr(10))
-        or address.startswith("@")
-        or address.endswith("@")
-    ):
-        problems.append("MAIL_FROM: must be an e-mail address, optionally with a display name")
-
-    if problems:
-        raise ConfigError(problems)
-
-    return Config(
-        secret_key=secret_key or "",
-        allowed_hosts=allowed_hosts,
-        data_dir=data_dir,
-        debug=debug,
-        trusted_proxies=proxies,
-        log_level=log_level,
-        default_timezone=timezone,
-        directory=DirectoryConfig(
         server=server,
         user_ou_dn=user_ou_dn,
         bind_dn=bind_dn,
@@ -221,19 +196,67 @@ def load_config(environ: Mapping[str, str]) -> Config:
         ca_file=ca_file,
         publisher_group_dn=publisher_group_dn,
         admin_group_dn=admin_group_dn,
-        ),
+    )
-        oidc=OidcConfig(
+
+
+def _read_oidc(r: _Reader, *, debug: bool) -> OidcConfig:
+    issuer = r.required("OIDC_ISSUER", "issuer address from the provider's OpenID configuration")
+    client_id = r.required("OIDC_CLIENT_ID", "client ID of the provider's application")
+    client_secret = r.required("OIDC_CLIENT_SECRET", "client secret of the provider's application")
+    base_url = r.required("PUBLIC_BASE_URL", "address users reach the portal at, e.g. https://host")
+    base_url = base_url.rstrip("/")
+    if issuer and urlsplit(issuer).scheme != "https":
+        r.problem("OIDC_ISSUER: must be an https address")
+    if base_url:
+        parts = urlsplit(base_url)
+        allowed = ("https", "http") if debug else ("https",)
+        if parts.scheme not in allowed or not parts.netloc or parts.path or parts.query:
+            r.problem("PUBLIC_BASE_URL: must be an https origin such as https://host")
+    return OidcConfig(
         issuer=issuer,
         client_id=client_id,
         client_secret=client_secret,
         public_base_url=base_url,
-        ),
-        smtp=SmtpConfig(
-            host=smtp_host,
-            port=smtp_port,
-            security=smtp_security,
-            username=smtp_username,
-            password=smtp_password,
-            sender=sender,
-        ),
     )
+
+
+def _read_smtp(r: _Reader) -> SmtpConfig:
+    host = r.required("SMTP_HOST", "host name of the mail server")
+    if "://" in host or "/" in host or ":" in host:
+        r.problem("SMTP_HOST: must be a host name only; set the port in SMTP_PORT")
+    security = (r.raw("SMTP_SECURITY") or "starttls").lower()
+    if security not in SMTP_SECURITY_MODES:
+        r.problem(f"SMTP_SECURITY: must be one of {', '.join(SMTP_SECURITY_MODES)}")
+        security = "starttls"
+    port = SMTP_DEFAULT_PORTS[security]
+    port_raw = r.raw("SMTP_PORT")
+    if port_raw is not None:
+        if port_raw.isdigit() and 0 < int(port_raw) < 65536:
+            port = int(port_raw)
+        else:
+            r.problem("SMTP_PORT: must be a port number from 1 to 65535")
+    username = r.required("SMTP_USERNAME", "user name of the mailbox")
+    password = r.required("SMTP_PASSWORD", "password of the mailbox")
+    sender = r.required("MAIL_FROM", "sender address of the portal's e-mails")
+    address = parseaddr(sender)[1]
+    if sender and (
+        address.count("@") != 1
+        or any(c in sender for c in chr(13) + chr(10))
+        or address.startswith("@")
+        or address.endswith("@")
+    ):
+        r.problem("MAIL_FROM: must be an e-mail address, optionally with a display name")
+    return SmtpConfig(
+        host=host, port=port, security=security, username=username, password=password, sender=sender
+    )
+
+
+def load_config(environ: Mapping[str, str]) -> Config:
+    reader = _Reader(environ)
+    core = _read_core(reader)
+    directory = _read_directory(reader)
+    oidc = _read_oidc(reader, debug=core["debug"])
+    smtp = _read_smtp(reader)
+    if reader.problems:
+        raise ConfigError(reader.problems)
+    return Config(**core, directory=directory, oidc=oidc, smtp=smtp)

portal/config/health.py

@@ -17,7 +17,7 @@ def healthz(request):
         with connection.cursor() as cursor:
             cursor.execute("SELECT 1")
             cursor.fetchone()
-    except Exception as exc:  # noqa: BLE001 - any failure means unavailable
+    except Exception as exc:  # any failure means unavailable
         logger.error("health check failed", extra={"error_type": type(exc).__name__})
         return JsonResponse({"status": "unavailable"}, status=503)
     return JsonResponse({"status": "ok"})

portal/tests/helpers.py

@@ -0,0 +1,16 @@
+"""Shared test helpers."""
+
+from django.test import Client
+
+from portal.accounts.session_store import LOGIN_FLOW
+from portal.adapters.idp import Flow
+
+
+def sign_in(adapters, username="alice", next_path=None, client=None):
+    """Run the whole flow with the fake provider; returns (client, callback response)."""
+    client = client or Client()
+    adapters.idp.sign_in_as(username)
+    query = f"?next={next_path}" if next_path else ""
+    client.get("/auth/login" + query)
+    flow = Flow.from_dict(client.session[LOGIN_FLOW])
+    return client, client.get("/auth/callback", adapters.idp.callback_params(flow))

portal/tests/ldap_stub.py

@@ -7,27 +7,27 @@ class LDAPError(Exception):
     pass
 
 
-class SERVER_DOWN(LDAPError):  # noqa: N801
+class SERVER_DOWN(LDAPError):
     pass
 
 
-class INVALID_CREDENTIALS(LDAPError):  # noqa: N801
+class INVALID_CREDENTIALS(LDAPError):
     pass
 
 
-class INSUFFICIENT_ACCESS(LDAPError):  # noqa: N801
+class INSUFFICIENT_ACCESS(LDAPError):
     pass
 
 
-class CONSTRAINT_VIOLATION(LDAPError):  # noqa: N801
+class CONSTRAINT_VIOLATION(LDAPError):
     pass
 
 
-class UNWILLING_TO_PERFORM(LDAPError):  # noqa: N801
+class UNWILLING_TO_PERFORM(LDAPError):
     pass
 
 
-class INVALID_SYNTAX(LDAPError):  # noqa: N801
+class INVALID_SYNTAX(LDAPError):
     pass
 
 

portal/tests/test_config.py

@@ -58,7 +58,7 @@ def test_process_exits_nonzero_naming_both_variables(tmp_path):
         LOG_LEVEL="loud",
         DJANGO_SETTINGS_MODULE="portal.config.settings",
     )
-    result = subprocess.run(  # noqa: S603
+    result = subprocess.run(
         [sys.executable, "manage.py", "check"],
         cwd=ROOT,
         env=env,

portal/tests/test_shell.py

@@ -7,7 +7,7 @@ import pytest
 from django.test import Client
 from django.utils import translation
 
-from portal.tests.test_signin import sign_in
+from portal.tests.helpers import sign_in
 
 pytestmark = pytest.mark.django_db(transaction=True)
 

portal/tests/test_signin.py

@@ -14,20 +14,11 @@ from portal.accounts.session_store import LOGIN_FLOW, ROLES
 from portal.accounts.sessions import SessionUser
 from portal.adapters.idp import Flow
 from portal.audit.models import AuditEntry
+from portal.tests.helpers import sign_in
 
 pytestmark = pytest.mark.django_db(transaction=True)
 
 
-def sign_in(adapters, username="alice", next_path=None, client=None):
-    """Run the whole flow with the fake provider; returns (client, callback response)."""
-    client = client or Client()
-    adapters.idp.sign_in_as(username)
-    query = f"?next={next_path}" if next_path else ""
-    client.get("/auth/login" + query)
-    flow = Flow.from_dict(client.session[LOGIN_FLOW])
-    return client, client.get("/auth/callback", adapters.idp.callback_params(flow))
-
-
 def age_the_cache(client):
     session = client.session
     session[ROLES] = {**session[ROLES], "checked": time.time() - 3600}

portal/tests/test_smtp_mailer.py

@@ -67,10 +67,10 @@ class FakeSmtpModule:
 
         return Connection()
 
-    def SMTP(self, *args, **kwargs):  # noqa: N802
+    def SMTP(self, *args, **kwargs):
         return self._connection("SMTP", args, kwargs)
 
-    def SMTP_SSL(self, *args, **kwargs):  # noqa: N802
+    def SMTP_SSL(self, *args, **kwargs):
         return self._connection("SMTP_SSL", args, kwargs)
 
     def names(self):

pyproject.toml

@@ -56,7 +56,7 @@ target-version = "py313"
 extend-exclude = ["**/migrations", "_bmad", "_bmad-output", ".agents", "context-resources"]
 
 [tool.ruff.lint]
-select = ["E", "F", "I", "B", "UP", "S"]
+select = ["E", "F", "I", "B", "UP", "S", "SIM", "RUF100"]
 
 [tool.ruff.lint.per-file-ignores]
 "portal/tests/*" = ["S"]