acme-dns.nix: one systemd attrset (statix W20) — lint gate green

statix flagged the repeated `systemd.` keys (tmpfiles marker, acme-dns daemon, traefik handoff oneshot); they are now one nested attrset. Purely structural: `#cc-ci` still evaluates. With #33 this makes the push self-test's lint stage pass again. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqkQq3CDmFWcQ7u1LzoyRz
Merge pull request 'lint: ruff format + one auto-fix so the push self-test is green again' (#33 ) from chore/lint-fix into main
2026-09-07 21:17:50 +00:00 · 2026-09-07 21:15:07 +00:00 · 2026-09-07 21:15:05 +00:00 · 2026-09-07 20:13:24 +00:00 · 2026-09-07 19:56:58 +00:00 · 2026-08-31 20:46:32 +00:00
97 changed files with 582 additions and 490 deletions
@@ -206,7 +206,11 @@ def _local_history_row(run_id, res):
    so render_history is unchanged. `number` is the run dir name (the /runs/<id>/ path + _results_for
    key); link to the Drone build when the id is numeric, else to the local summary card."""
    ref = res.get("ref") or ""
-    url = f"{DRONE_URL}/{CI_REPO}/{run_id}" if str(run_id).isdigit() else f"/runs/{run_id}/summary.html"
+    url = (
        f"{DRONE_URL}/{CI_REPO}/{run_id}"
        if str(run_id).isdigit()
        else f"/runs/{run_id}/summary.html"
    )
    return {
        "recipe": res.get("recipe"),
        "status": _run_status(res),
@@ -351,7 +355,7 @@ def _card(r):
        f'<div class="card">{shot}<div class="body">'
        f'<div class="name">{html.escape(r["recipe"])}</div>'
        f'<div class="row"><span class="pill" style="background:{color}">{html.escape(r["status"])}</span>'
-        f'<code>{html.escape(r["version"])}</code></div>'
+        f"<code>{html.escape(r['version'])}</code></div>"
        f"{_flags_html(r['flags'])}"
        f'<div class="foot"><a href="{run_url}">run #{num} · {_ago(r["finished"])}</a>'
        f'<a href="/recipe/{html.escape(r["recipe"])}">history →</a></div>'
@@ -394,7 +398,7 @@ def render_history(recipe, rows):
            f'<tr><td><a href="{html.escape(r["url"])}">#{r["number"]}</a></td>'
            f'<td><span class="pill" style="background:{color}">{html.escape(r["status"])}</span></td>'
            f"<td>{lvl}</td><td><code>{html.escape(r['version'])}</code></td>"
-            f'<td>{_ago(r["finished"])}</td><td>{shot}</td></tr>'
+            f"<td>{_ago(r['finished'])}</td><td>{shot}</td></tr>"
        )
    body = "\n".join(trs) or '<tr><td colspan="6">no runs for this recipe yet</td></tr>'
    inner = (
@@ -16,7 +16,7 @@
    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
  };
-  outputs = { nixpkgs, sops-nix, ... }:
+  outputs = { self, nixpkgs, sops-nix, ... }:
    let
      system = "x86_64-linux";
      pkgs = nixpkgs.legacyPackages.${system};
@@ -35,13 +35,25 @@
      ];
    in
    {
      # The whole CI server as one reusable module (nix/modules/default.nix): every service,
      # the harness tooling, sops wiring and acme-dns — but no hardware, networking, tailscale
      # node, root keys or stateVersion. sops-nix's module comes bundled so a consumer only has
      # to import this and set `cc-ci.publicIPv4` (+ `cc-ci.sopsFile` when it is not built from
      # a --recursive clone). A consuming flake MUST make its `cc-ci` input follow its own
      # `nixpkgs` and `sops-nix`, otherwise two sops-nix module trees collide.
      # Consumer: recipe-maintainers/cc-ci-orchestrator `#cc-ci` (CI server + orchestrator on
      # one Hetzner host, 2026-09).
      nixosModules.cc-ci-server = {
        imports = [ sops-nix.nixosModules.sops ./nix/modules ];
      };
      nixosConfigurations = {
        # Canonical live host target: the Hetzner cc-ci server.
        # Use `.#cc-ci` for the current production host.
        cc-ci = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            sops-nix.nixosModules.sops
+            self.nixosModules.cc-ci-server
            ./nix/hosts/cc-ci-hetzner/configuration.nix
          ];
        };
@@ -61,7 +73,7 @@
        cc-ci-hetzner = nixpkgs.lib.nixosSystem {
          inherit system;
          modules = [
-            sops-nix.nixosModules.sops
+            self.nixosModules.cc-ci-server
            ./nix/hosts/cc-ci-hetzner/configuration.nix
          ];
        };
@@ -1,38 +1,23 @@
-# cc-ci on Hetzner Cloud — NixOS configuration.
+# cc-ci on Hetzner Cloud — the canonical STANDALONE CI-server host.
-# Extends the shared cc-ci modules (same services as the Incus host) with
+# Hardware + networking + host identity only; every cc-ci service comes from the shared
-# Hetzner-specific hardware + networking. Run in parallel with the Incus cc-ci
+# `nixosModules.cc-ci-server` module (nix/modules/default.nix), which flake.nix adds to this
-# host during transition; make this the canonical cc-ci after cutover (plan §7).
+# host. The same module builds the combined CI-server + orchestrator host declared in
 # recipe-maintainers/cc-ci-orchestrator (`#cc-ci`), which is where cc-ci is moving (2026-09).
 #
 # To apply after `terraform apply` + nixos-infect:
 #   git clone --recursive https://git.autonomic.zone/recipe-maintainers/cc-ci.git /etc/cc-ci
 #   install -m600 <age-private-key> /var/lib/sops-nix/key.txt
-#   nixos-rebuild switch --flake /etc/cc-ci#cc-ci-hetzner
+#   nixos-rebuild switch --flake 'git+file:///etc/cc-ci?submodules=1#cc-ci'
 { pkgs, ... }:
 {
  imports = [
    ./hardware.nix
    ./networking.nix
    ../../modules/packages.nix
    ../../modules/secrets.nix
    ../../modules/acme-dns.nix
    ../../modules/swarm.nix
    ../../modules/docker-prune.nix
    ../../modules/abra.nix
    ../../modules/proxy.nix
    ../../modules/drone.nix
    ../../modules/drone-runner.nix
    ../../modules/bridge.nix
    ../../modules/dashboard.nix
    ../../modules/reports.nix
    ../../modules/backupbot.nix
    ../../modules/harness.nix
    ../../modules/warm-keycloak.nix
    ../../modules/nightly-sweep.nix
  ];
-  # Timezone (same as Incus host — see configuration.nix there for rationale).
+  # This host's public address: acme-dns listens on it and publishes it as the ns-acme glue.
-  time.timeZone = "UTC";
+  cc-ci.publicIPv4 = "91.98.47.73";
-  environment.etc."timezone".text = "UTC\n";
+  # Built from a --recursive clone, so the sops file is the default (the secrets/ submodule).
  # Tailscale — keeps the orchestrator→cc-ci access path unchanged (direct peer).
  # On the Hetzner host the auth key is also seeded via /etc/ts-auth-key.
@@ -64,15 +49,9 @@
    allowedTCPPorts = [ 22 80 443 ];
  };
-  # Phase `nixenv`: the Drone exec runner resolves recipe shell-outs from this host PATH
+  # The recipe-test tool set (ccciRuntimeTools) is installed by the cc-ci-server module; the ssh
-  # (PATH=/run/current-system/sw/bin). Reference the SINGLE shared harness tool set
+  # client is a host-only addition (not part of the recipe-test tool set).
-  # (pkgs.ccciRuntimeTools — includes git-lfs, openssl, etc.) instead of a hand-maintained list,
+  environment.systemPackages = [ pkgs.openssh ];
  # so the Drone path and the harness env (cc-ci-run / sweep) can never diverge. `openssh` is a
  # host-only addition (ssh client), not part of the recipe-test tool set. Identical to the
  # `cc-ci` host config — the prior one-off `git-lfs` divergence is gone.
  environment.systemPackages = pkgs.ccciRuntimeTools ++ [ pkgs.openssh ];
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
  system.stateVersion = "24.11";
 }
@@ -3,18 +3,19 @@
 # This host is authoritative only for acme.commoninternet.net. Gandi continues
 # to own commoninternet.net; it delegates this narrow zone and one permanent
 # _acme-challenge CNAME manually. No Gandi credential is present here.
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 let
  publicIPv4 = config.cc-ci.publicIPv4;
  acmeDnsConfig = pkgs.writeText "cc-ci-acme-dns.conf" ''
    [general]
-    listen = "91.98.47.73:53"
+    listen = "${publicIPv4}:53"
    protocol = "both4"
    domain = "acme.commoninternet.net"
    nsname = "ns-acme.commoninternet.net"
    nsadmin = "hostmaster.commoninternet.net"
    records = [
      "acme.commoninternet.net. NS ns-acme.commoninternet.net.",
-      "ns-acme.commoninternet.net. A 91.98.47.73",
+      "ns-acme.commoninternet.net. A ${publicIPv4}",
    ]
    debug = false
@@ -48,6 +49,8 @@ let
  '';
 in
 {
  imports = [ ./options.nix ];
  users.groups.acme-dns = { };
  users.users.acme-dns = {
    isSystemUser = true;
@@ -57,79 +60,86 @@ in
  environment.etc."acme-dns/lego.env".source = legoEnvironment;
  # The staging order has completed successfully. This marker permits the
  # production ACME post-run hook to hand a renewed certificate to Traefik.
  systemd.tmpfiles.rules = [
    "f /var/lib/ci-certs/acme-production-enabled 0600 root root -"
  ];
  networking.firewall = {
    allowedTCPPorts = [ 53 ];
    allowedUDPPorts = [ 53 ];
  };
-  systemd.services.acme-dns = {
+
-    description = "Restricted authoritative DNS for cc-ci ACME DNS-01";
+
-    wantedBy = [ "multi-user.target" ];
+  # One `systemd` attrset (statix W20): the tmpfiles marker, the acme-dns daemon and the
-    after = [ "network-online.target" ];
+  # traefik handoff oneshot.
-    wants = [ "network-online.target" ];
+  systemd = {
-    serviceConfig = {
+    # The staging order has completed successfully. This marker permits the
-      User = "acme-dns";
+    # production ACME post-run hook to hand a renewed certificate to Traefik.
-      Group = "acme-dns";
+    tmpfiles.rules = [
-      StateDirectory = "acme-dns";
+      "f /var/lib/ci-certs/acme-production-enabled 0600 root root -"
-      StateDirectoryMode = "0700";
+    ];
-      WorkingDirectory = "/var/lib/acme-dns";
+
-      ExecStart = "${pkgs.acme-dns}/bin/acme-dns -c ${acmeDnsConfig}";
+    services.acme-dns = {
-      Restart = "on-failure";
+      description = "Restricted authoritative DNS for cc-ci ACME DNS-01";
-      RestartSec = "5s";
+      wantedBy = [ "multi-user.target" ];
-      AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+      after = [ "network-online.target" ];
-      CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+      wants = [ "network-online.target" ];
-      NoNewPrivileges = true;
+      serviceConfig = {
-      PrivateTmp = true;
+        User = "acme-dns";
-      PrivateDevices = true;
+        Group = "acme-dns";
-      ProtectHome = true;
+        StateDirectory = "acme-dns";
-      ProtectSystem = "strict";
+        StateDirectoryMode = "0700";
-      ReadWritePaths = [ "/var/lib/acme-dns" ];
+        WorkingDirectory = "/var/lib/acme-dns";
-      RestrictAddressFamilies = [ "AF_INET" "AF_UNIX" ];
+        ExecStart = "${pkgs.acme-dns}/bin/acme-dns -c ${acmeDnsConfig}";
        Restart = "on-failure";
        RestartSec = "5s";
        AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
        CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
        NoNewPrivileges = true;
        PrivateTmp = true;
        PrivateDevices = true;
        ProtectHome = true;
        ProtectSystem = "strict";
        ReadWritePaths = [ "/var/lib/acme-dns" ];
        RestrictAddressFamilies = [ "AF_INET" "AF_UNIX" ];
      };
    };
  };
-  # Traefik consumes its wildcard as immutable Swarm secrets, so a renewed
+    # Traefik consumes its wildcard as immutable Swarm secrets, so a renewed
-  # host certificate must be copied and reconciled rather than merely reloaded.
+    # host certificate must be copied and reconciled rather than merely reloaded.
-  # This service is started only by the production-mode ACME postRun hook.
+    # This service is started only by the production-mode ACME postRun hook.
-  systemd.services.cc-ci-acme-traefik-handoff = {
+    services.cc-ci-acme-traefik-handoff = {
-    description = "Install renewed cc-ci wildcard into Traefik Swarm secrets";
+      description = "Install renewed cc-ci wildcard into Traefik Swarm secrets";
-    after = [ "docker.service" "deploy-proxy.service" ];
+      after = [ "docker.service" "deploy-proxy.service" ];
-    requires = [ "docker.service" ];
+      requires = [ "docker.service" ];
-    path = [ pkgs.coreutils pkgs.docker pkgs.systemd pkgs.gnugrep ];
+      path = [ pkgs.coreutils pkgs.docker pkgs.systemd pkgs.gnugrep ];
-    serviceConfig = {
+      serviceConfig = {
-      Type = "oneshot";
+        Type = "oneshot";
-      UMask = "0077";
+        UMask = "0077";
      };
      script = ''
        src=/var/lib/acme/ci.commoninternet.net
        dst=/var/lib/ci-certs/live
        test -s "$src/fullchain.pem"
        test -s "$src/key.pem"
        install -d -m 0700 "$dst"
        install -m 0444 "$src/fullchain.pem" "$dst/fullchain.pem.new"
        install -m 0400 "$src/key.pem" "$dst/privkey.pem.new"
        mv -f "$dst/fullchain.pem.new" "$dst/fullchain.pem"
        mv -f "$dst/privkey.pem.new" "$dst/privkey.pem"
        # deploy-proxy performs the health-gated Swarm rollout. Its reconciler
        # derives a fresh version from the public certificate chain and inserts
        # the matching ssl_cert/ssl_key secrets before deploying Traefik.
        systemctl restart deploy-proxy.service
        # A successful rollout no longer references old wildcard versions. Best
        # effort removal retains any secret Docker still reports as in use.
        keep="v$(sha256sum "$dst/fullchain.pem" | cut -c1-16)"
        docker secret ls --format '{{.Name}}' | \
          grep -E '^traefik_ci_commoninternet_net_ssl_(cert|key)_v' | \
          grep -v -E "_(ssl_cert|ssl_key)_$keep\$" | \
          while IFS= read -r stale; do docker secret rm "$stale" || true; done
      '';
    };
    script = ''
      src=/var/lib/acme/ci.commoninternet.net
      dst=/var/lib/ci-certs/live
      test -s "$src/fullchain.pem"
      test -s "$src/key.pem"
      install -d -m 0700 "$dst"
      install -m 0444 "$src/fullchain.pem" "$dst/fullchain.pem.new"
      install -m 0400 "$src/key.pem" "$dst/privkey.pem.new"
      mv -f "$dst/fullchain.pem.new" "$dst/fullchain.pem"
      mv -f "$dst/privkey.pem.new" "$dst/privkey.pem"
      # deploy-proxy performs the health-gated Swarm rollout. Its reconciler
      # derives a fresh version from the public certificate chain and inserts
      # the matching ssl_cert/ssl_key secrets before deploying Traefik.
      systemctl restart deploy-proxy.service
      # A successful rollout no longer references old wildcard versions. Best
      # effort removal retains any secret Docker still reports as in use.
      keep="v$(sha256sum "$dst/fullchain.pem" | cut -c1-16)"
      docker secret ls --format '{{.Name}}' | \
        grep -E '^traefik_ci_commoninternet_net_ssl_(cert|key)_v' | \
        grep -v -E "_(ssl_cert|ssl_key)_$keep\$" | \
        while IFS= read -r stale; do docker secret rm "$stale" || true; done
    '';
  };
  security.acme = {
@@ -0,0 +1,44 @@
 # The cc-ci CI server as ONE reusable NixOS module — exported from flake.nix as
 # `nixosModules.cc-ci-server`. Everything a host needs to BE cc-ci, except what is physical or
 # identity and therefore belongs to the host that imports it: hardware, networking, the tailscale
 # node, root SSH keys, `system.stateVersion`. A host sets `cc-ci.publicIPv4` (and, when it is not
 # built from a --recursive clone, `cc-ci.sopsFile`) and imports this.
 #
 # Consumers: nix/hosts/cc-ci-hetzner (the canonical standalone host) and
 # recipe-maintainers/cc-ci-orchestrator's `#cc-ci` host, which runs the CI server and the
 # orchestrator together (2026-09).
 { pkgs, ... }:
 {
  imports = [
    ./options.nix
    ./packages.nix
    ./secrets.nix
    ./acme-dns.nix
    ./swarm.nix
    ./docker-prune.nix
    ./abra.nix
    ./proxy.nix
    ./drone.nix
    ./drone-runner.nix
    ./bridge.nix
    ./dashboard.nix
    ./reports.nix
    ./backupbot.nix
    ./harness.nix
    ./warm-keycloak.nix
    ./nightly-sweep.nix
  ];
  # Recipes bind-mount /etc/localtime and /etc/timezone; the harness compares timestamps across
  # host and containers, so the host is UTC like every container.
  time.timeZone = "UTC";
  environment.etc."timezone".text = "UTC\n";
  # Phase `nixenv`: the Drone exec runner resolves recipe shell-outs from this host PATH
  # (/run/current-system/sw/bin). Install the SINGLE shared harness tool set (pkgs.ccciRuntimeTools,
  # defined in packages.nix) so the Drone path and the harness env (cc-ci-run / sweep) can never
  # diverge.
  environment.systemPackages = pkgs.ccciRuntimeTools;
  nix.settings.experimental-features = [ "nix-command" "flakes" ];
 }
@@ -0,0 +1,33 @@
 # The few host-identity values the cc-ci modules need but must not hard-code, so that the same
 # modules can build the canonical Hetzner host, a throwaway rebuild VM, or a combined host that
 # also runs the cc-ci orchestrator (2026-09: recipe-maintainers/cc-ci-orchestrator imports
 # `nixosModules.cc-ci-server` from this repo and runs both on one box).
 { lib, ... }:
 {
  options.cc-ci = {
    publicIPv4 = lib.mkOption {
      type = lib.types.str;
      example = "91.98.47.73";
      description = ''
        The host's public IPv4 address. acme-dns binds its authoritative listener to it and
        publishes it as the `ns-acme` glue record. Must match the Gandi A record for
        ns-acme.commoninternet.net and the address the cc-ci DNS names point at.
      '';
    };
    sopsFile = lib.mkOption {
      type = lib.types.path;
      default = ../../secrets/secrets.yaml;
      defaultText = lib.literalExpression "../../secrets/secrets.yaml";
      example = "/etc/cc-ci/secrets/secrets.yaml";
      description = ''
        The sops-encrypted secrets.yaml (recipe-maintainers/cc-ci-secrets). The default is the
        `secrets/` git submodule inside this repo, which only exists when this flake is built from
        a `--recursive` clone (`git+file:///root/cc-ci?submodules=1`). A consumer that imports
        cc-ci as a plain flake input (no submodule) sets this to an absolute path on the host
        instead — e.g. the `/etc/cc-ci` deployed checkout's `secrets/secrets.yaml` — which
        sops-nix then reads at activation time rather than copying into the store.
      '';
    };
  };
 }
@@ -6,8 +6,15 @@
 # off-box master recovery key).
 { config, ... }:
 {
  imports = [ ./options.nix ];
  sops = {
-    defaultSopsFile = ../../secrets/secrets.yaml;
+    # See options.nix: the submodule path by default; an absolute host path on a combined host
    # that imports cc-ci as a flake input without the private submodule.
    defaultSopsFile = config.cc-ci.sopsFile;
    # sops-nix validates store-path sops files at build time. An absolute (string) path is read
    # at activation instead, so validation has to be off for that case.
    validateSopsFiles = builtins.isPath config.cc-ci.sopsFile;
    # Decrypt using the host's SSH host key (converted to an age identity by sops-nix).
    age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
    # Phase-1c: also accept a bootstrap age key at a fixed path — THE one out-of-band secret,
@@ -98,7 +98,7 @@ def _stage_rows(stages: list[dict]) -> str:
        scolor = STATUS_COLOR.get(st.get("status", ""), "#8b949e")
        rows.append(
            f'<tr class="stage"><td colspan="2"><span class="mark" style="color:{scolor}">{smark}</span>'
-            f'<b>{html.escape(st.get("name", "?"))}</b></td>'
+            f"<b>{html.escape(st.get('name', '?'))}</b></td>"
            f'<td class="st" style="color:{scolor}">{html.escape(st.get("status", ""))}</td></tr>'
        )
        for t in st.get("tests", []):
@@ -175,7 +175,7 @@ def render_card_html(data: dict, screenshot_rel: str | None = "screenshot.png")
        ok = bool(flags.get(key))
        flag_bits.append(
            f'<span class="flag" style="border-color:{"#3fb950" if ok else "#f85149"}">'
-            f'{STATUS_MARK["pass"] if ok else STATUS_MARK["fail"]} {lbl}</span>'
+            f"{STATUS_MARK['pass'] if ok else STATUS_MARK['fail']} {lbl}</span>"
        )
    show_shot = bool(screenshot_rel) and bool(data.get("screenshot"))
    shot_html = (
@@ -88,9 +88,9 @@ def test_account_lifecycle_and_post_roundtrip(live_app):
    # Step 1: PDS describe via goat — recipe self-identifies as did:web:<domain>
    out = _in_container(domain, f"goat pds describe {PDS_HOST_LOCAL} 2>&1")
-    assert (
+    assert f"did:web:{domain}" in out, (
-        f"did:web:{domain}" in out
+        f"goat pds describe did not contain expected DID 'did:web:{domain}'. Output:\n{out[:500]!r}"
-    ), f"goat pds describe did not contain expected DID 'did:web:{domain}'. Output:\n{out[:500]!r}"
+    )
    # Step 2: Create account (UUID-suffixed handle = no run-to-run collision)
    out = _goat_admin(
@@ -133,9 +133,9 @@ def test_account_lifecycle_and_post_roundtrip(live_app):
        assert s == 200, f"createRecord HTTP {s}: {body!r}"
        record_uri = (body or {}).get("uri", "")
        # URI format: at://<did>/app.bsky.feed.post/<rkey>
-        assert record_uri.startswith(
+        assert record_uri.startswith(f"at://{new_did}/app.bsky.feed.post/"), (
-            f"at://{new_did}/app.bsky.feed.post/"
+            f"unexpected record uri: {record_uri!r}"
-        ), f"unexpected record uri: {record_uri!r}"
+        )
        rkey = record_uri.rsplit("/", 1)[-1]
        assert rkey, f"no rkey in uri: {record_uri!r}"
@@ -148,9 +148,9 @@ def test_account_lifecycle_and_post_roundtrip(live_app):
        )
        assert s == 200, f"getRecord HTTP {s}: {body!r}"
        record_value = (body or {}).get("value", {})
-        assert (
+        assert record_value.get("text") == marker, (
-            record_value.get("text") == marker
+            f"post text did not round-trip: created={marker!r}, fetched={record_value.get('text')!r}"
-        ), f"post text did not round-trip: created={marker!r}, fetched={record_value.get('text')!r}"
+        )
        assert record_value.get("$type") == "app.bsky.feed.post"
    finally:
        # Step 6: Best-effort cleanup. (The per-run domain teardown will discard the volume
@@ -26,6 +26,6 @@ def test_describe_server_returns_atproto_envelope(live_app):
    # At least one of these atproto-spec fields must be present
    expected_any = ("availableUserDomains", "inviteCodeRequired", "links", "did")
    present = [k for k in expected_any if k in body]
-    assert (
+    assert present, (
-        present
+        f"describe-server missing all of {expected_any}; got keys: {sorted(body.keys())[:20]}"
-    ), f"describe-server missing all of {expected_any}; got keys: {sorted(body.keys())[:20]}"
+    )
@@ -17,6 +17,6 @@ def test_pds_health_returns_version(live_app):
    url = f"https://{live_app}/xrpc/_health"
    status, body = harness_http.retry_http_get(url, expect_status=200, max_wait=60, interval=3)
    assert status == 200, f"GET {url} HTTP {status} (expected 200)"
-    assert (
+    assert isinstance(body, dict) and isinstance(body.get("version"), str) and body["version"], (
-        isinstance(body, dict) and isinstance(body.get("version"), str) and body["version"]
+        f"GET {url} response is not the expected health envelope: {body!r}"
-    ), f"GET {url} response is not the expected health envelope: {body!r}"
+    )
@@ -30,6 +30,6 @@ def test_get_session_requires_auth(live_app):
        f"body: {body!r}"
    )
    # The XRPC error envelope is JSON with an `error` field per the atproto spec.
-    assert isinstance(body, dict) and body.get(
+    assert isinstance(body, dict) and body.get("error"), (
-        "error"
+        f"expected XRPC JSON error envelope; got: {body!r}"
-    ), f"expected XRPC JSON error envelope; got: {body!r}"
+    )
@@ -11,6 +11,6 @@ import _p4  # noqa: E402
 def test_restore_returns_state(live_app):
-    assert _p4.account_exists(
+    assert _p4.account_exists(live_app), (
-        live_app
+        "restore did not bring back the seeded marker account (PDS data did not survive restore)"
-    ), "restore did not bring back the seeded marker account (PDS data did not survive restore)"
+    )
@@ -78,9 +78,9 @@ def test_7_new_run_blocks_until_reap_finishes(lock_dir, pool, monkeypatch):
    line = wait_marker(state["acquirer_out"], "ACQUIRED", timeout=15)
    assert line, "new run never acquired after the reap"
    acquired_ts = float(line.split()[1])
-    assert (
+    assert acquired_ts >= state["teardown_end"], (
-        acquired_ts >= state["teardown_end"]
+        f"new run acquired at {acquired_ts} BEFORE the reap finished at {state['teardown_end']}"
-    ), f"new run acquired at {acquired_ts} BEFORE the reap finished at {state['teardown_end']}"
+    )
    # The new run must hold a lock the next probe can SEE (fresh inode at the path).
    assert lock_state(DOMAIN) == "held"
@@ -160,17 +160,17 @@ def test_11_warm_canonical_names_never_probed(lock_dir, monkeypatch):
    monkeypatch.setattr(
        lifecycle,
        "_docker_names",
-        lambda kind, stack: ["warm-keycloak_ci_commoninternet_net_app"]
+        lambda kind, stack: (
-        if kind == "service"
+            ["warm-keycloak_ci_commoninternet_net_app"] if kind == "service" else []
-        else [],
+        ),
    )
    monkeypatch.setattr(lifecycle, "teardown_app", lambda d, verify=True: calls.append(d))
    lifecycle.janitor()
    assert calls == []
    lockdir = os.environ["CCCI_APP_LOCK_DIR"]
-    assert [
+    assert [f for f in os.listdir(lockdir) if f.startswith("cc-ci-app-")] == [], (
-        f for f in os.listdir(lockdir) if f.startswith("cc-ci-app-")
+        "janitor must not create lockfiles for non-run-app names"
-    ] == [], "janitor must not create lockfiles for non-run-app names"
+    )
 def test_12_degrades_safely_on_bad_lockfile_and_missing_dir(lock_dir, monkeypatch, capsys):
@@ -61,9 +61,9 @@ def test_3_lock_fd_not_inherited_by_children(lock_dir, pool):
    p.kill()
    p.wait(timeout=10)
    assert os.path.exists(f"/proc/{child_pid}"), "child should outlive the holder"
-    assert (
+    assert wait_lock_state(DOMAIN, "free") == "free", (
-        wait_lock_state(DOMAIN, "free") == "free"
+        "lock must release on holder death even with a live child (PEP 446 non-inheritable fd)"
-    ), "lock must release on holder death even with a live child (PEP 446 non-inheritable fd)"
+    )
 def test_4_second_acquire_blocks_until_first_exits(lock_dir, pool):
@@ -64,9 +64,9 @@ def test_20c_same_domain_runs_each_keep_their_own_count(tmp_path, lock_dir, pool
    pa.wait(timeout=15)
    line_b = wait_marker(out_b, "COUNT")
-    assert (
+    assert line_b is not None and line_b.strip() == "COUNT 1", (
-        line_b is not None and line_b.strip() == "COUNT 1"
+        line_b
-    ), line_b  # B's file survived A's remove
+    )  # B's file survived A's remove
    pb.wait(timeout=15)
@@ -150,9 +150,9 @@ def test_cryptpad_pad_content_survives_fresh_session(live_app):
            # --- session 1: create the pad + write the marker ---
            ctx1 = browser.new_context(ignore_https_errors=True)
            page, pad_url = _open_pad(ctx1, f"https://{live_app}/pad/")
-            assert (
+            assert "#/2/pad/edit/" in pad_url, (
-                "#/2/pad/edit/" in pad_url
+                f"CryptPad did not create a fragment-keyed pad URL; got {pad_url!r}"
-            ), f"CryptPad did not create a fragment-keyed pad URL; got {pad_url!r}"
+            )
            ck = _ckeditor_frame(page, reload_url=pad_url)
            assert ck is not None, "CKEditor content frame never attached (pad editor not ready)"
            _dismiss_store_modal(page)
@@ -161,9 +161,9 @@ def test_cryptpad_pad_content_survives_fresh_session(live_app):
            page.wait_for_timeout(1000)
            body.type(marker, delay=40)
            page.wait_for_timeout(12000)  # let CryptPad encrypt + sync the update to the server
-            assert (
+            assert marker in ck.locator("body").inner_text(), (
-                marker in ck.locator("body").inner_text()
+                "marker not present in the editor after typing — type did not land"
-            ), "marker not present in the editor after typing — type did not land"
+            )
            ctx1.close()
            # --- session 2: FRESH context (no shared storage/localStorage) reads the pad back by URL.
@@ -51,9 +51,9 @@ def test_cryptpad_spa_renders_with_no_console_errors(live_app):
            title = (page.title() or "").lower()
            body = page.content()
            blower = body.lower()
-            assert (
+            assert "cryptpad" in title or "cryptpad" in blower, (
-                "cryptpad" in title or "cryptpad" in blower
+                f"CryptPad SPA does not carry brand. title={title!r}, body excerpt: {body[:200]!r}"
-            ), f"CryptPad SPA does not carry brand. title={title!r}, body excerpt: {body[:200]!r}"
+            )
            # Canonical CryptPad asset references in the rendered DOM
            canonical = ("/customize/", "/components/", "main.js", "/api/broadcast")
@@ -14,6 +14,6 @@ MARKER = "/cryptpad/data/ci-marker.txt"
 def test_backup_captures_state(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original"
+        "the seeded state was not present at backup time"
-    ), "the seeded state was not present at backup time"
+    )
@@ -14,6 +14,6 @@ MARKER = "/cryptpad/data/ci-marker.txt"
 def test_restore_returns_state(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original"
+        "restore did not return the pre-mutation state"
-    ), "restore did not return the pre-mutation state"
+    )
@@ -14,6 +14,6 @@ MARKER = "/cryptpad/data/ci-marker.txt"
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "upgrade-survives", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "upgrade-survives"
+        "data did not survive the upgrade"
-    ), "data did not survive the upgrade"
+    )
@@ -79,9 +79,9 @@ def test_static_file_roundtrip_and_404(live_app):
        # A random non-existent path must 404 — proves real static-file semantics, distinguishing a
        # working server from a 200-everything stub or a mis-routed Traefik fallback.
        miss_status, _ = _get(f"https://{live_app}/ccci-missing-{uuid.uuid4().hex}.txt")
-        assert (
+        assert miss_status == 404, (
-            miss_status == 404
+            f"missing path returned {miss_status} (expected 404 — generic 200-returner / mis-route?)"
-        ), f"missing path returned {miss_status} (expected 404 — generic 200-returner / mis-route?)"
+        )
    finally:
        with contextlib.suppress(OSError):
            os.remove(path)
@@ -53,9 +53,9 @@ def test_content_type_html_and_txt(live_app):
    ct_txt = h_txt.get("content-type", "")
    # nginx default: "text/html" for .html and "text/plain" for .txt (may include "; charset=utf-8")
-    assert ct_html.startswith(
+    assert ct_html.startswith("text/html"), (
-        "text/html"
+        f"{html_name} Content-Type={ct_html!r}, expected text/html (nginx MIME config broken?)"
-    ), f"{html_name} Content-Type={ct_html!r}, expected text/html (nginx MIME config broken?)"
+    )
-    assert ct_txt.startswith(
+    assert ct_txt.startswith("text/plain"), (
-        "text/plain"
+        f"{txt_name} Content-Type={ct_txt!r}, expected text/plain (nginx MIME config broken?)"
-    ), f"{txt_name} Content-Type={ct_txt!r}, expected text/plain (nginx MIME config broken?)"
+    )
@@ -16,6 +16,6 @@ MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt"
 def test_backup_captures_state(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER_PATH]).strip() == "original", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER_PATH]).strip() == "original"
+        "the seeded state was not present at backup time"
-    ), "the seeded state was not present at backup time"
+    )
@@ -17,6 +17,6 @@ MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt"
 def test_restore_returns_state(live_app):
    restored = lifecycle.exec_in_app(live_app, ["cat", MARKER_PATH]).strip()
-    assert (
+    assert restored == "original", (
-        restored == "original"
+        f"restore did not return the pre-mutation (backed-up) state: got {restored!r}"
-    ), f"restore did not return the pre-mutation (backed-up) state: got {restored!r}"
+    )
@@ -16,6 +16,6 @@ MARKER_PATH = "/usr/share/nginx/html/ci-marker.txt"
 def test_upgrade_preserves_data(live_app):
    # the marker seeded by ops.pre_upgrade (before the harness upgraded) is still served
-    assert (
+    assert lifecycle.http_fetch(live_app, "/ci-marker.txt")[1].strip() == "upgrade-survives", (
-        lifecycle.http_fetch(live_app, "/ci-marker.txt")[1].strip() == "upgrade-survives"
+        "data did not survive the upgrade"
-    ), "data did not survive the upgrade"
+    )
@@ -81,9 +81,9 @@ def mint_admin(domain: str) -> tuple[str, str]:
            key = line.split("=", 1)[1].strip()
        elif line.startswith("CCCI_API_USER="):
            user = line.split("=", 1)[1].strip()
-    assert (
+    assert key and user, (
-        key and user
+        f"could not bootstrap discourse admin/API key; rails output tail:\n{out[-1000:]}"
-    ), f"could not bootstrap discourse admin/API key; rails output tail:\n{out[-1000:]}"
+    )
    return key, user
@@ -48,23 +48,23 @@ def test_create_topic_roundtrip(live_app):
        headers=hdrs,
        timeout=60,
    )
-    assert status in (200, 201) and isinstance(
+    assert status in (200, 201) and isinstance(body, dict), (
-        body, dict
+        f"create topic failed: HTTP {status}, body={body!r}"
-    ), f"create topic failed: HTTP {status}, body={body!r}"
+    )
    topic_id = body.get("topic_id")
    assert topic_id, f"create topic returned no topic_id: {body!r}"
    # 4) Read the topic back and assert title + first-post body round-trip.
    status, got = harness_http.http_get(f"{base}/t/{topic_id}.json", headers=hdrs, timeout=30)
-    assert status == 200 and isinstance(
+    assert status == 200 and isinstance(got, dict), (
-        got, dict
+        f"read topic failed: HTTP {status}, body={got!r}"
-    ), f"read topic failed: HTTP {status}, body={got!r}"
+    )
-    assert (
+    assert got.get("title") == title, (
-        got.get("title") == title
+        f"topic title did not round-trip: sent {title!r}, got {got.get('title')!r}"
-    ), f"topic title did not round-trip: sent {title!r}, got {got.get('title')!r}"
+    )
    posts = (got.get("post_stream") or {}).get("posts") or []
    assert posts, f"topic has no posts on read-back: {got!r}"
    first_cooked = posts[0].get("cooked", "")
-    assert (
+    assert marker in first_cooked, (
-        marker in first_cooked
+        f"topic body did not round-trip: marker {marker!r} not in first post {first_cooked!r}"
-    ), f"topic body did not round-trip: marker {marker!r} not in first post {first_cooked!r}"
+    )
@@ -20,12 +20,12 @@ def test_site_json_has_discourse_config(live_app):
    status, body = harness_http.retry_http_get(
        f"https://{live_app}/site.json", expect_status=200, max_wait=120, interval=5
    )
-    assert status == 200 and isinstance(
+    assert status == 200 and isinstance(body, dict), (
-        body, dict
+        f"GET /site.json failed: HTTP {status}, body type={type(body).__name__}"
-    ), f"GET /site.json failed: HTTP {status}, body type={type(body).__name__}"
+    )
    # /site.json carries Discourse-specific structure — `categories` (a list) and `groups` are always
    # present in a booted Discourse. A non-Discourse 200 (placeholder page) would not parse to this.
    assert "categories" in body, f"/site.json missing 'categories' key: keys={list(body)[:20]}"
-    assert isinstance(
+    assert isinstance(body["categories"], list), (
-        body["categories"], list
+        f"/site.json 'categories' not a list: {type(body['categories']).__name__}"
-    ), f"/site.json 'categories' not a list: {type(body['categories']).__name__}"
+    )
@@ -14,9 +14,7 @@ from harness import lifecycle  # noqa: E402
 def _psql(domain, sql):
-    cmd = (
+    cmd = f'PGPASSWORD=$(cat /run/secrets/db_password) psql -U discourse -d discourse -tAc "{sql}"'
        "PGPASSWORD=$(cat /run/secrets/db_password) " f'psql -U discourse -d discourse -tAc "{sql}"'
    )
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
@@ -13,13 +13,11 @@ from harness import lifecycle  # noqa: E402
 def _psql(domain, sql):
-    cmd = (
+    cmd = f'PGPASSWORD=$(cat /run/secrets/db_password) psql -U discourse -d discourse -tAc "{sql}"'
        "PGPASSWORD=$(cat /run/secrets/db_password) " f'psql -U discourse -d discourse -tAc "{sql}"'
    )
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded discourse postgres state was not present at backup time"
-    ), "the seeded discourse postgres state was not present at backup time"
+    )
@@ -13,13 +13,11 @@ from harness import lifecycle  # noqa: E402
 def _psql(domain, sql):
-    cmd = (
+    cmd = f'PGPASSWORD=$(cat /run/secrets/db_password) psql -U discourse -d discourse -tAc "{sql}"'
        "PGPASSWORD=$(cat /run/secrets/db_password) " f'psql -U discourse -d discourse -tAc "{sql}"'
    )
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation discourse postgres state (data-integrity failure)"
-    ), "restore did not return the pre-mutation discourse postgres state (data-integrity failure)"
+    )
@@ -62,6 +62,6 @@ def test_ghost_admin_route_is_wired(live_app):
    assert status in (200, 302), f"unexpected status: {status}"
    if status == 200:
        # The admin SPA references /ghost-assets/ or contains "ghost" in title/body
-        assert (
+        assert "ghost" in body.lower(), (
-            "ghost" in body.lower()
+            f"GET {url} 200 but body has no Ghost markers: {body[:200]!r}"
-        ), f"GET {url} 200 but body has no Ghost markers: {body[:200]!r}"
+        )
@@ -35,10 +35,10 @@ def test_content_api_settings_endpoint(live_app):
    assert body is not None, f"GET {url} returned non-JSON body"
    # On success: {"settings": {...}}. On error: {"errors": [...]}. Either shape is valid.
    if status == 200:
-        assert (
+        assert isinstance(body, dict) and "settings" in body, (
-            isinstance(body, dict) and "settings" in body
+            f"200 response missing 'settings' envelope: {body!r}"
-        ), f"200 response missing 'settings' envelope: {body!r}"
+        )
    else:
-        assert isinstance(body, dict) and (
+        assert isinstance(body, dict) and ("errors" in body or "message" in body or body), (
-            "errors" in body or "message" in body or body
+            f"error response not a proper Ghost error envelope: {body!r}"
-        ), f"error response not a proper Ghost error envelope: {body!r}"
+        )
@@ -43,17 +43,17 @@ def test_create_post_roundtrip(live_app):
    title = f"ccci-marker-{uniq}"
    marker = f"ccci-body-marker-{uniq}-roundtrip"
    created = admin.create_post(title, f"<p>{marker}</p>")
-    assert (
+    assert created.get("title") == title, (
-        created.get("title") == title
+        f"created post title mismatch: sent {title!r}, got {created.get('title')!r}"
-    ), f"created post title mismatch: sent {title!r}, got {created.get('title')!r}"
+    )
    # 4) Read it back by id and assert the post survived the round-trip (title always returned;
    #    html returned because we requested ?formats=html).
    got = admin.get_post(created["id"])
-    assert (
+    assert got.get("title") == title, (
-        got.get("title") == title
+        f"post title did not round-trip: sent {title!r}, got {got.get('title')!r}"
-    ), f"post title did not round-trip: sent {title!r}, got {got.get('title')!r}"
+    )
    html = got.get("html") or ""
-    assert (
+    assert marker in html, (
-        marker in html
+        f"post body did not round-trip: marker {marker!r} not in read-back html {html!r}"
-    ), f"post body did not round-trip: marker {marker!r} not in read-back html {html!r}"
+    )
@@ -22,7 +22,7 @@ from harness import lifecycle  # noqa: E402
 def _mysql(domain, sql):
-    cmd = 'MYSQL_PWD="$(cat /run/secrets/db_password)" ' f'mysql -u root -N -s ghost -e "{sql}"'
+    cmd = f'MYSQL_PWD="$(cat /run/secrets/db_password)" mysql -u root -N -s ghost -e "{sql}"'
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
@@ -15,11 +15,11 @@ from harness import lifecycle  # noqa: E402
 def _mysql(domain, sql):
-    cmd = 'MYSQL_PWD="$(cat /run/secrets/db_password)" ' f'mysql -u root -N -s ghost -e "{sql}"'
+    cmd = f'MYSQL_PWD="$(cat /run/secrets/db_password)" mysql -u root -N -s ghost -e "{sql}"'
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
 def test_backup_captures_state(live_app):
-    assert (
+    assert _mysql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _mysql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded ghost MySQL marker was not present at backup time"
-    ), "the seeded ghost MySQL marker was not present at backup time"
+    )
@@ -22,7 +22,7 @@ from harness import lifecycle  # noqa: E402
 def _mysql(domain, sql):
-    cmd = 'MYSQL_PWD="$(cat /run/secrets/db_password)" ' f'mysql -u root -N -s ghost -e "{sql}"'
+    cmd = f'MYSQL_PWD="$(cat /run/secrets/db_password)" mysql -u root -N -s ghost -e "{sql}"'
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
@@ -14,11 +14,11 @@ from harness import lifecycle  # noqa: E402
 def _mysql(domain, sql):
-    cmd = 'MYSQL_PWD="$(cat /run/secrets/db_password)" ' f'mysql -u root -N -s ghost -e "{sql}"'
+    cmd = f'MYSQL_PWD="$(cat /run/secrets/db_password)" mysql -u root -N -s ghost -e "{sql}"'
    return lifecycle.exec_in_app(domain, ["sh", "-c", cmd], service="db").strip()
 def test_upgrade_preserves_state(live_app):
-    assert (
+    assert _mysql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _mysql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "the seeded ghost MySQL marker did not survive the upgrade redeploy (data loss on upgrade)"
-    ), "the seeded ghost MySQL marker did not survive the upgrade redeploy (data loss on upgrade)"
+    )
@@ -145,9 +145,9 @@ def test_lfs_roundtrip(live_app):
            text=True,
            env={**os.environ, **git_env},
        )
-        assert (
+        assert "testblob.bin" in lfs_ls.stdout, (
-            "testblob.bin" in lfs_ls.stdout
+            f"testblob.bin not in git-lfs ls-files: {lfs_ls.stdout}"
-        ), f"testblob.bin not in git-lfs ls-files: {lfs_ls.stdout}"
+        )
        # 6. Download in a FRESH clone (proves the LFS server stores and serves the object)
        fresh_dir = tempfile.mkdtemp(prefix="ccci-gitea-lfs-dl-")
@@ -158,9 +158,9 @@ def test_lfs_roundtrip(live_app):
            with open(fetched_path, "rb") as f:
                fetched = f.read()
            fetched_sha256 = hashlib.sha256(fetched).hexdigest()
-            assert (
+            assert fetched_sha256 == expected_sha256, (
-                fetched_sha256 == expected_sha256
+                f"LFS round-trip OID mismatch: expected {expected_oid}, got sha256:{fetched_sha256}"
-            ), f"LFS round-trip OID mismatch: expected {expected_oid}, got sha256:{fetched_sha256}"
+            )
        finally:
            shutil.rmtree(fresh_dir, ignore_errors=True)
@@ -171,9 +171,9 @@ def test_lfs_roundtrip(live_app):
            ["sh", "-c", "grep -E '^LFS_JWT_SECRET' /etc/gitea/app.ini || echo NOT_FOUND"],
            timeout=30,
        ).strip()
-        assert (
+        assert current_jwt and "NOT_FOUND" not in current_jwt, (
-            current_jwt and "NOT_FOUND" not in current_jwt
+            "Could not read LFS_JWT_SECRET from /etc/gitea/app.ini before restart"
-        ), "Could not read LFS_JWT_SECRET from /etc/gitea/app.ini before restart"
+        )
        # Restart the gitea container
        lifecycle.exec_in_app(live_app, ["true"], timeout=5)  # no-op to confirm exec works
@@ -213,9 +213,9 @@ def test_lfs_roundtrip(live_app):
            assert os.path.exists(pr_blob), "testblob.bin not fetched in post-restart clone"
            with open(pr_blob, "rb") as f:
                pr_data = f.read()
-            assert (
+            assert hashlib.sha256(pr_data).hexdigest() == expected_sha256, (
-                hashlib.sha256(pr_data).hexdigest() == expected_sha256
+                "LFS object corrupted after restart — JWT secret may have changed"
-            ), "LFS object corrupted after restart — JWT secret may have changed"
+            )
        finally:
            shutil.rmtree(post_restart_dir, ignore_errors=True)
@@ -220,7 +220,7 @@ def pre_restore(ctx):
    generic.assert_serving(ctx.domain, ctx.meta)
    ok = _delete_marker_repo(ctx.domain, user, password)
    assert ok, f"pre_restore: could not delete {_MARKER_REPO} repo on {ctx.domain}"
-    assert not marker_repo_exists(
+    assert not marker_repo_exists(ctx.domain, user, password), (
-        ctx.domain, user, password
+        f"pre_restore: {_MARKER_REPO} still present after delete — divergence did not take"
-    ), f"pre_restore: {_MARKER_REPO} still present after delete — divergence did not take"
+    )
    print(f"  gitea ops: {_MARKER_REPO!r} deleted (diverged from backup state)", flush=True)
@@ -22,6 +22,6 @@ def test_backup_captures_marker_repo(live_app, meta):
    # backupbot cycles the gitea container during backup — wait for it to be back up.
    generic.assert_serving(live_app, meta)
    user, password = admin_creds(live_app)
-    assert marker_repo_exists(
+    assert marker_repo_exists(live_app, user, password), (
-        live_app, user, password
+        f"{live_app}: ci-marker repo is not present at backup time (backup would capture empty state)"
-    ), f"{live_app}: ci-marker repo is not present at backup time (backup would capture empty state)"
+    )
@@ -65,8 +65,8 @@ def test_install_gitea(live_app, meta):
            )
            page.wait_for_selector("input#user_name", timeout=20_000)
            content = page.content()
-            assert (
+            assert "gitea" in content.lower() or "sign in" in content.lower(), (
-                "gitea" in content.lower() or "sign in" in content.lower()
+                "Sign-in page did not render expected gitea content"
-            ), "Sign-in page did not render expected gitea content"
+            )
        finally:
            browser.close()
@@ -20,6 +20,6 @@ def test_upgrade_preserves_marker_repo(live_app, meta):
    """The ci-marker repo survived the upgrade to the PR head (data continuity)."""
    generic.assert_serving(live_app, meta)
    user, password = admin_creds(live_app)
-    assert marker_repo_exists(
+    assert marker_repo_exists(live_app, user, password), (
-        live_app, user, password
+        f"{live_app}: ci-marker repo did not survive the upgrade (sqlite3 data lost)"
-    ), f"{live_app}: ci-marker repo did not survive the upgrade (sqlite3 data lost)"
+    )
@@ -111,13 +111,13 @@ def test_immich_processes_uploaded_asset_metadata_and_statistics(live_app):
        if exif and exif.get("exifImageWidth"):
            break
        time.sleep(5)
-    assert (
+    assert exif and exif.get("exifImageWidth") == 1 and exif.get("exifImageHeight") == 1, (
-        exif and exif.get("exifImageWidth") == 1 and exif.get("exifImageHeight") == 1
+        f"immich metadata-extraction did not populate the 1x1 PNG dimensions in exifInfo: {exif!r}"
-    ), f"immich metadata-extraction did not populate the 1x1 PNG dimensions in exifInfo: {exif!r}"
+    )
    # the asset is catalogued into the owner's library statistics (list-back in aggregate)
    sst, stats = harness_http.http_request("GET", f"{base}/api/assets/statistics", headers=auth)
    assert sst == 200 and isinstance(stats, dict), f"statistics HTTP {sst}: {stats!r}"
-    assert (
+    assert stats.get("images", 0) >= 1 and stats.get("total", 0) >= 1, (
-        stats.get("images", 0) >= 1 and stats.get("total", 0) >= 1
+        f"uploaded asset not reflected in library statistics: {stats!r}"
-    ), f"uploaded asset not reflected in library statistics: {stats!r}"
+    )
@@ -121,6 +121,6 @@ def test_immich_upload_asset_readback_and_thumbnail(live_app):
        if thumb == 200:
            break
        time.sleep(5)
-    assert (
+    assert thumb == 200, (
-        thumb == 200
+        f"immich did not generate a thumbnail/derivative for the uploaded asset (last HTTP {thumb})"
-    ), f"immich did not generate a thumbnail/derivative for the uploaded asset (last HTTP {thumb})"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "seeded postgres state not present at backup time"
-    ), "seeded postgres state not present at backup time"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -144,25 +144,25 @@ def test_create_confidential_client_and_obtain_token(live_app):
        # Use the client to obtain its own token (client_credentials grant)
        tok_status, tok_resp = _client_credentials_token(live_app, client_id, client_secret)
-        assert (
+        assert tok_status == 200, (
-            tok_status == 200
+            f"client_credentials token returned HTTP {tok_status}: {tok_resp!r}"
-        ), f"client_credentials token returned HTTP {tok_status}: {tok_resp!r}"
+        )
        access_token = tok_resp.get("access_token") if isinstance(tok_resp, dict) else None
-        assert (
+        assert isinstance(access_token, str) and access_token.count(".") == 2, (
-            isinstance(access_token, str) and access_token.count(".") == 2
+            f"client_credentials access_token not a JWT: {access_token!r}"
-        ), f"client_credentials access_token not a JWT: {access_token!r}"
+        )
        # Decode the JWT payload; assert azp matches the new client
        payload = json.loads(_b64url_decode(access_token.split(".")[1]))
-        assert (
+        assert payload.get("azp") == client_id, (
-            payload.get("azp") == client_id
+            f"client_credentials JWT azp={payload.get('azp')!r} != client_id={client_id!r}"
-        ), f"client_credentials JWT azp={payload.get('azp')!r} != client_id={client_id!r}"
+        )
        # Service-account token does NOT carry a session-scoped user (azp + clientId differ from
        # admin-cli token). The presence of azp + iss == per-run-domain proves the issuance flow.
        expected_iss = f"https://{live_app}/realms/master"
-        assert (
+        assert payload.get("iss") == expected_iss, (
-            payload.get("iss") == expected_iss
+            f"JWT iss={payload.get('iss')!r} != {expected_iss!r}"
-        ), f"JWT iss={payload.get('iss')!r} != {expected_iss!r}"
+        )
    finally:
        # Idempotent cleanup
        if cleanup_id:
@@ -43,17 +43,17 @@ def test_password_grant_issues_valid_jwt(live_app):
    token = kc_admin.admin_token(live_app, password)
    # Shape: a JWT is exactly 3 base64url segments
-    assert (
+    assert isinstance(token, str) and token.count(".") == 2, (
-        isinstance(token, str) and token.count(".") == 2
+        f"access_token does not look like a JWT (no 3 segments): len={len(token) if token else 0}"
-    ), f"access_token does not look like a JWT (no 3 segments): len={len(token) if token else 0}"
+    )
    payload = _decode_jwt_payload(token)
    # iss = the issuer URL, must be the per-run domain's /realms/master endpoint
    expected_iss = f"https://{live_app}/realms/master"
-    assert (
+    assert payload.get("iss") == expected_iss, (
-        payload.get("iss") == expected_iss
+        f"JWT iss claim {payload.get('iss')!r} != {expected_iss!r}"
-    ), f"JWT iss claim {payload.get('iss')!r} != {expected_iss!r}"
+    )
    # azp = authorized party (which client requested this token)
    assert payload.get("azp") == "admin-cli", f"JWT azp claim {payload.get('azp')!r} != 'admin-cli'"
@@ -68,6 +68,6 @@ def test_password_grant_issues_valid_jwt(live_app):
    # iat (issued at) is also a standard claim
    iat = payload.get("iat")
-    assert (
+    assert isinstance(iat, int) and iat <= time.time() + 60, (
-        isinstance(iat, int) and iat <= time.time() + 60
+        f"JWT iat {iat!r} not a reasonable past timestamp"
-    ), f"JWT iat {iat!r} not a reasonable past timestamp"
+    )
@@ -42,9 +42,9 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    # Sanity-check the creds shape — orchestrator-written
    assert kc["domain"]
    # WC1: realm is per-run namespaced "<parent>-<6hex>" so concurrent dependents never collide.
-    assert re.fullmatch(
+    assert re.fullmatch(r"lasuite-docs-[0-9a-f]{6}", kc["realm"]), (
-        r"lasuite-docs-[0-9a-f]{6}", kc["realm"]
+        f"realm {kc['realm']!r} not the per-run namespaced form lasuite-docs-<6hex>"
-    ), f"realm {kc['realm']!r} not the per-run namespaced form lasuite-docs-<6hex>"
+    )
    assert kc["client_id"] == "lasuite-docs"
    assert isinstance(kc["client_secret"], str) and len(kc["client_secret"]) >= 16
    assert isinstance(kc["password"], str) and len(kc["password"]) >= 16
@@ -77,11 +77,11 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    assert isinstance(token, str) and token.count(".") == 2, f"access_token is not a JWT: {token!r}"
    payload = json.loads(_b64url_decode(token.split(".")[1]))
    assert payload.get("iss") == expected_iss, f"JWT iss={payload.get('iss')!r} != {expected_iss!r}"
-    assert (
+    assert payload.get("azp") == kc["client_id"], (
-        payload.get("azp") == kc["client_id"]
+        f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
-    ), f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
+    )
    assert payload.get("typ") == "Bearer", f"JWT typ={payload.get('typ')!r} != 'Bearer'"
    exp = payload.get("exp")
-    assert (
+    assert isinstance(exp, int) and exp > time.time(), (
-        isinstance(exp, int) and exp > time.time()
+        f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
-    ), f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
+    )
@@ -18,6 +18,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded postgres state was not present at backup time"
-    ), "the seeded postgres state was not present at backup time"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -56,6 +56,6 @@ def test_minio_bucket_present_and_object_roundtrip(live_app):
    # The object was listed (its key appears) and its content round-tripped intact.
    assert f"{marker}.txt" in out, f"uploaded object not listed in bucket: {out!r}"
-    assert (
+    assert f"READBACK:{marker}" in out, (
-        f"READBACK:{marker}" in out
+        f"object content did not round-trip through MinIO; got: {out!r}"
-    ), f"object content did not round-trip through MinIO; got: {out!r}"
+    )
@@ -46,9 +46,9 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    # Creds shape. WC1: realm is per-run namespaced "<parent>-<6hex>"; client_id stays the parent.
    assert kc["domain"]
-    assert re.fullmatch(
+    assert re.fullmatch(r"lasuite-drive-[0-9a-f]{6}", kc["realm"]), (
-        r"lasuite-drive-[0-9a-f]{6}", kc["realm"]
+        f"realm {kc['realm']!r} not the per-run namespaced form lasuite-drive-<6hex>"
-    ), f"realm {kc['realm']!r} not the per-run namespaced form lasuite-drive-<6hex>"
+    )
    assert kc["client_id"] == "lasuite-drive"
    assert isinstance(kc["client_secret"], str) and len(kc["client_secret"]) >= 16
    assert isinstance(kc["password"], str) and len(kc["password"]) >= 16
@@ -80,11 +80,11 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    assert isinstance(token, str) and token.count(".") == 2, f"access_token is not a JWT: {token!r}"
    payload = json.loads(_b64url_decode(token.split(".")[1]))
    assert payload.get("iss") == expected_iss, f"JWT iss={payload.get('iss')!r} != {expected_iss!r}"
-    assert (
+    assert payload.get("azp") == kc["client_id"], (
-        payload.get("azp") == kc["client_id"]
+        f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
-    ), f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
+    )
    assert payload.get("typ") == "Bearer", f"JWT typ={payload.get('typ')!r} != 'Bearer'"
    exp = payload.get("exp")
-    assert (
+    assert isinstance(exp, int) and exp > time.time(), (
-        isinstance(exp, int) and exp > time.time()
+        f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
-    ), f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
+    )
@@ -18,6 +18,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded postgres state was not present at backup time"
-    ), "the seeded postgres state was not present at backup time"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -46,9 +46,9 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    # Creds shape. WC1: realm is per-run namespaced "<parent>-<6hex>"; client_id stays the parent.
    assert kc["domain"]
-    assert re.fullmatch(
+    assert re.fullmatch(r"lasuite-meet-[0-9a-f]{6}", kc["realm"]), (
-        r"lasuite-meet-[0-9a-f]{6}", kc["realm"]
+        f"realm {kc['realm']!r} not the per-run namespaced form lasuite-meet-<6hex>"
-    ), f"realm {kc['realm']!r} not the per-run namespaced form lasuite-meet-<6hex>"
+    )
    assert kc["client_id"] == "lasuite-meet"
    assert isinstance(kc["client_secret"], str) and len(kc["client_secret"]) >= 16
    assert isinstance(kc["password"], str) and len(kc["password"]) >= 16
@@ -80,11 +80,11 @@ def test_oidc_password_grant_against_dep_keycloak(live_app, deps):
    assert isinstance(token, str) and token.count(".") == 2, f"access_token is not a JWT: {token!r}"
    payload = json.loads(_b64url_decode(token.split(".")[1]))
    assert payload.get("iss") == expected_iss, f"JWT iss={payload.get('iss')!r} != {expected_iss!r}"
-    assert (
+    assert payload.get("azp") == kc["client_id"], (
-        payload.get("azp") == kc["client_id"]
+        f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
-    ), f"JWT azp={payload.get('azp')!r} != {kc['client_id']!r}"
+    )
    assert payload.get("typ") == "Bearer", f"JWT typ={payload.get('typ')!r} != 'Bearer'"
    exp = payload.get("exp")
-    assert (
+    assert isinstance(exp, int) and exp > time.time(), (
-        isinstance(exp, int) and exp > time.time()
+        f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
-    ), f"JWT exp={exp!r} not a future timestamp (now={time.time():.0f})"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded postgres state was not present at backup time"
-    ), "the seeded postgres state was not present at backup time"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -43,7 +43,7 @@ def test_send_and_receive_mail(live_app):
    deadline = time.time() + 150
    while time.time() < deadline:
        for box in ("INBOX", "Junk"):
-            query = f"doveadm search -u '{email_addr}' mailbox {box} " f"header subject '{marker}'"
+            query = f"doveadm search -u '{email_addr}' mailbox {box} header subject '{marker}'"
            out = lifecycle.exec_in_app(live_app, ["sh", "-c", query], service="imap")
            if out.strip():  # a non-empty result = "<mailbox-guid> <uid>" → message stored
                return
@@ -24,6 +24,6 @@ def test_create_mailbox_and_read_back(live_app):
    cfg = _mailu.config_export(live_app)
    emails = _mailu.user_emails(cfg)
-    assert (
+    assert email in emails, (
-        email in emails
+        f"created mailbox {email} not present in mailu config-export users {emails}"
-    ), f"created mailbox {email} not present in mailu config-export users {emails}"
+    )
@@ -34,12 +34,12 @@ def test_federation_version_endpoint(live_app):
    assert status == 200, f"GET {url} HTTP {status} (expected 200)"
    assert isinstance(body, dict), f"federation version returned non-dict: {type(body).__name__}"
    server = body.get("server")
-    assert isinstance(
+    assert isinstance(server, dict), (
-        server, dict
+        f"federation version response missing 'server' envelope: {body!r}"
-    ), f"federation version response missing 'server' envelope: {body!r}"
+    )
    name = server.get("name")
    assert name == "Synapse", f"server.name={name!r}, expected 'Synapse'"
    version = server.get("version")
-    assert (
+    assert isinstance(version, str) and len(version) > 0, (
-        isinstance(version, str) and len(version) > 0
+        f"server.version is not a non-empty string: {version!r}"
-    ), f"server.version is not a non-empty string: {version!r}"
+    )
@@ -23,6 +23,6 @@ def test_synapse_client_versions_returns_json(live_app):
    url = f"https://{live_app}/_matrix/client/versions"
    status, body = harness_http.retry_http_get(url, expect_status=200, max_wait=60, interval=3)
    assert status == 200, f"GET {url} HTTP {status} (expected 200)"
-    assert (
+    assert isinstance(body, dict) and isinstance(body.get("versions"), list) and body["versions"], (
-        isinstance(body, dict) and isinstance(body.get("versions"), list) and body["versions"]
+        f"GET {url} did not return Matrix client-versions document: {body!r}"
-    ), f"GET {url} did not return Matrix client-versions document: {body!r}"
+    )
@@ -127,8 +127,7 @@ def _admin_register(domain: str, secret: str, username: str, password: str, admi
        if r["status"] == 200:
            if attempt > 1:
                print(
-                    f"  [register] {username}: succeeded on attempt {attempt} "
+                    f"  [register] {username}: succeeded on attempt {attempt} (synapse recovered)",
                    f"(synapse recovered)",
                    flush=True,
                )
            return r["body"] or {}
@@ -177,9 +176,9 @@ def test_register_two_users_send_receive_message(live_app):
    create + invite + join a room; send and read a message."""
    domain = live_app
    secret = _registration_secret(domain)
-    assert (
+    assert secret and len(secret) >= 16, (
-        secret and len(secret) >= 16
+        f"registration shared secret missing/short: len={len(secret) if secret else 0}"
-    ), f"registration shared secret missing/short: len={len(secret) if secret else 0}"
+    )
    suffix = uuid.uuid4().hex[:8]
    user_a = f"alice{suffix}"
@@ -18,6 +18,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded postgres state was not present at backup time"
-    ), "the seeded postgres state was not present at backup time"
+    )
@@ -26,6 +26,6 @@ def test_serving_and_client_api(live_app, meta):
    # The client-API version document is real synapse JSON (proves the app, not just a proxy 200).
    body = lifecycle.http_body(live_app, "/_matrix/client/versions")
    doc = json.loads(body)
-    assert (
+    assert isinstance(doc.get("versions"), list) and doc["versions"], (
-        isinstance(doc.get("versions"), list) and doc["versions"]
+        "no matrix client versions advertised"
-    ), "no matrix client versions advertised"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -17,6 +17,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -41,9 +41,9 @@ def test_create_message_roundtrip(live_app):
        headers=auth,
        timeout=30,
    )
-    assert (
+    assert status in (200, 201) and isinstance(team, dict) and team.get("id"), (
-        status in (200, 201) and isinstance(team, dict) and team.get("id")
+        f"team creation failed: HTTP {status}, body={team!r}"
-    ), f"team creation failed: HTTP {status}, body={team!r}"
+    )
    status, chan = harness_http.http_post(
        f"{base}/channels",
        data={
@@ -55,9 +55,9 @@ def test_create_message_roundtrip(live_app):
        headers=auth,
        timeout=30,
    )
-    assert (
+    assert status in (200, 201) and isinstance(chan, dict) and chan.get("id"), (
-        status in (200, 201) and isinstance(chan, dict) and chan.get("id")
+        f"channel creation failed: HTTP {status}, body={chan!r}"
-    ), f"channel creation failed: HTTP {status}, body={chan!r}"
+    )
    # 4) POST a unique marker message.
    marker = f"ccci-marker-{uniq}-roundtrip"
@@ -67,13 +67,13 @@ def test_create_message_roundtrip(live_app):
        headers=auth,
        timeout=30,
    )
-    assert (
+    assert status in (200, 201) and isinstance(post, dict) and post.get("id"), (
-        status in (200, 201) and isinstance(post, dict) and post.get("id")
+        f"post creation failed: HTTP {status}, body={post!r}"
-    ), f"post creation failed: HTTP {status}, body={post!r}"
+    )
    # 5) Read it back by id and assert the message survived the round-trip.
    status, got = harness_http.http_get(f"{base}/posts/{post['id']}", headers=auth, timeout=30)
    assert status == 200 and isinstance(got, dict), f"read-back failed: HTTP {status}, body={got!r}"
-    assert (
+    assert got.get("message") == marker, (
-        got.get("message") == marker
+        f"message did not round-trip: sent {marker!r}, got {got.get('message')!r}"
-    ), f"message did not round-trip: sent {marker!r}, got {got.get('message')!r}"
+    )
@@ -28,6 +28,6 @@ def test_system_ping_ok(live_app):
    url = f"https://{live_app}/api/v4/system/ping"
    status, body = harness_http.retry_http_get(url, expect_status=200, max_wait=120, interval=3)
    assert status == 200, f"GET {url} HTTP {status} (expected 200)"
-    assert (
+    assert isinstance(body, dict) and body.get("status") == "OK", (
-        isinstance(body, dict) and body.get("status") == "OK"
+        f"/api/v4/system/ping did not report status=OK; got {body!r}"
-    ), f"/api/v4/system/ping did not report status=OK; got {body!r}"
+    )
@@ -105,6 +105,6 @@ def test_second_user_reads_first_users_message(live_app):
    # 5) user_b sees user_a's marker (cross-user delivery, not a self read-back)
    messages = [p.get("message") for p in (posts.get("posts") or {}).values()]
-    assert (
+    assert marker in messages, (
-        marker in messages
+        f"user_b did not see user_a's message {marker!r} in the channel; saw {messages!r}"
-    ), f"user_b did not see user_a's message {marker!r} in the channel; saw {messages!r}"
+    )
@@ -18,6 +18,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded postgres state was not present at backup time"
-    ), "the seeded postgres state was not present at backup time"
+    )
@@ -19,6 +19,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -18,6 +18,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -214,7 +214,7 @@ def handshake(
            elif msg_type == MSG_REJECT:
                f = _dec_fields(payload)
                result["error"] = (
-                    f"Rejected: {REJECT_TYPES.get(f.get(1, 0), 'Unknown')} " f"— {f.get(2, '')}"
+                    f"Rejected: {REJECT_TYPES.get(f.get(1, 0), 'Unknown')} — {f.get(2, '')}"
                )
                return result
            elif msg_type == MSG_CHANNELSTATE:
@@ -25,7 +25,7 @@ def test_handshake_completes_with_channel_presence(live_app):
    assert r["server_version"] is not None, "server did not send a Version message"
    assert r["auth_accepted"], f"authentication not accepted — {r.get('error')}"
    # Channel presence: the server must expose at least the root channel (beyond a bare TCP open).
-    assert (
+    assert len(r["channels"]) >= 1, (
-        len(r["channels"]) >= 1
+        f"server reported no channels (expected >=1 root channel) — {r!r}"
-    ), f"server reported no channels (expected >=1 root channel) — {r!r}"
+    )
    assert r["server_sync"], f"ServerSync handshake did not complete — {r.get('error')}"
@@ -23,6 +23,6 @@ def _sqlite(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _sqlite(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _sqlite(live_app, "SELECT v FROM ci_marker;") == "original"
+        "the seeded mumble sqlite marker was not present at backup time"
-    ), "the seeded mumble sqlite marker was not present at backup time"
+    )
@@ -25,6 +25,6 @@ def _sqlite(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _sqlite(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _sqlite(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation mumble sqlite marker (data-integrity failure)"
-    ), "restore did not return the pre-mutation mumble sqlite marker (data-integrity failure)"
+    )
@@ -91,6 +91,6 @@ def test_login_endpoint_returns_json(live_app):
    assert body is not None, f"/rest/login returned no parseable JSON: state={state}"
    # If it's a dict, it's the expected envelope; if it's a list, n8n shouldn't do that on this
    # endpoint, but accept either; only reject obvious non-shapes.
-    assert isinstance(
+    assert isinstance(body, dict | list), (
-        body, dict | list
+        f"/rest/login returned unexpected JSON type {type(body).__name__}: {body!r}"
-    ), f"/rest/login returned unexpected JSON type {type(body).__name__}: {body!r}"
+    )
@@ -72,9 +72,9 @@ def test_rest_settings_returns_json_with_known_keys(live_app):
    # (e.g. version 3.2.0+2.20.6).
    assert isinstance(body, dict), f"/rest/settings returned non-dict JSON: {type(body).__name__}"
    data = body.get("data") if "data" in body else body
-    assert isinstance(
+    assert isinstance(data, dict), (
-        data, dict
+        f"/rest/settings response missing 'data' envelope: keys={list(body.keys())[:10]}"
-    ), f"/rest/settings response missing 'data' envelope: keys={list(body.keys())[:10]}"
+    )
    # Bootstrap keys the editor SPA relies on across versions:
    #   - `userManagement`: the auth-mode dict (whether owner-setup is needed, smtp/email mode).
    #   - `defaultLocale`: i18n bootstrap; present on every n8n install.
@@ -178,17 +178,17 @@ def test_workflow_create_and_read_back(live_app):
        workflow_id,
        str(workflow_id),
    ), f"GET workflow id={fpayload.get('id')!r} != created id={workflow_id!r}"
-    assert (
+    assert fpayload.get("name") == name, (
-        fpayload.get("name") == name
+        f"workflow name didn't round-trip: created={name!r}, fetched={fpayload.get('name')!r}"
-    ), f"workflow name didn't round-trip: created={name!r}, fetched={fpayload.get('name')!r}"
+    )
    nodes = fpayload.get("nodes") or []
-    assert (
+    assert isinstance(nodes, list) and len(nodes) == 1, (
-        isinstance(nodes, list) and len(nodes) == 1
+        f"workflow nodes didn't round-trip: expected 1 node, got {len(nodes)}"
-    ), f"workflow nodes didn't round-trip: expected 1 node, got {len(nodes)}"
+    )
    node = nodes[0]
-    assert (
+    assert node.get("type") == "n8n-nodes-base.manualTrigger", (
-        node.get("type") == "n8n-nodes-base.manualTrigger"
+        f"node type didn't round-trip: {node.get('type')!r}"
-    ), f"node type didn't round-trip: {node.get('type')!r}"
+    )
-    assert (
+    assert node.get("name") == "Manual Trigger", (
-        node.get("name") == "Manual Trigger"
+        f"node name didn't round-trip: {node.get('name')!r}"
-    ), f"node name didn't round-trip: {node.get('name')!r}"
+    )
@@ -14,6 +14,6 @@ MARKER = "/home/node/.n8n/ci-marker.txt"
 def test_backup_captures_state(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original"
+        "the seeded state was not present at backup time"
-    ), "the seeded state was not present at backup time"
+    )
@@ -14,6 +14,6 @@ MARKER = "/home/node/.n8n/ci-marker.txt"
 def test_restore_returns_state(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "original"
+        "restore did not return the pre-mutation state"
-    ), "restore did not return the pre-mutation state"
+    )
@@ -14,6 +14,6 @@ MARKER = "/home/node/.n8n/ci-marker.txt"
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "upgrade-survives", (
-        lifecycle.exec_in_app(live_app, ["cat", MARKER]).strip() == "upgrade-survives"
+        "data did not survive the upgrade"
-    ), "data did not survive the upgrade"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_backup_captures_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "seeded postgres state not present at backup time"
-    ), "seeded postgres state not present at backup time"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_restore_returns_state(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "original", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "original"
+        "restore did not return the pre-mutation postgres state"
-    ), "restore did not return the pre-mutation postgres state"
+    )
@@ -14,6 +14,6 @@ def _psql(domain, sql):
 def test_upgrade_preserves_data(live_app):
-    assert (
+    assert _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives", (
-        _psql(live_app, "SELECT v FROM ci_marker;") == "upgrade-survives"
+        "postgres data did not survive the upgrade"
-    ), "postgres data did not survive the upgrade"
+    )
@@ -229,13 +229,13 @@ def _assert_green(rc: int, results: dict | None, canary: dict, note: str) -> Non
    # 1. Harness exit code must be 0 (GREEN).
    assert rc == 0, f"[{canary['id']}] harness returned non-zero rc={rc} — expected GREEN. {note}"
-    assert (
+    assert results is not None, (
-        results is not None
+        f"[{canary['id']}] results.json not written — harness may have crashed. {note}"
-    ), f"[{canary['id']}] results.json not written — harness may have crashed. {note}"
+    )
    # 2. Install tier must have passed.
    assert results.get("results", {}).get("install") == "pass", (
-        f"[{canary['id']}] install tier did not pass: " f"results={results.get('results')}. {note}"
+        f"[{canary['id']}] install tier did not pass: results={results.get('results')}. {note}"
    )
    # 3. No tier may have FAILED (skips are acceptable for recipes without backup or custom tests).
@@ -243,14 +243,14 @@ def _assert_green(rc: int, results: dict | None, canary: dict, note: str) -> Non
    assert not failed_tiers, f"[{canary['id']}] tiers failed: {failed_tiers}. {note}"
    # 4. Teardown must be clean (no leftover containers/volumes/secrets).
-    assert (
+    assert results.get("flags", {}).get("clean_teardown") is True, (
-        results.get("flags", {}).get("clean_teardown") is True
+        f"[{canary['id']}] clean_teardown=False — residual state left on server. {note}"
-    ), f"[{canary['id']}] clean_teardown=False — residual state left on server. {note}"
+    )
    # 5. No secret values leaked into the results artifact.
-    assert (
+    assert results.get("flags", {}).get("no_secret_leak") is True, (
-        results.get("flags", {}).get("no_secret_leak") is True
+        f"[{canary['id']}] no_secret_leak=False — a secret value appeared in results.json. {note}"
-    ), f"[{canary['id']}] no_secret_leak=False — a secret value appeared in results.json. {note}"
+    )
    # 6. Semantic stage assertions — TEETH CHECK.
    # These verify that specific named tests actually ran and passed in the expected stage.
@@ -174,10 +174,17 @@ def test_level_badge_shows_level_coloured(monkeypatch):
 def _write_run(base, run_id, recipe, finished, **kw):
    d = os.path.join(base, run_id)
    os.makedirs(d, exist_ok=True)
-    doc = {"recipe": recipe, "finished": finished, "run_id": run_id,
+    doc = {
-           "ref": kw.get("ref", "deadbeefcafe"), "version": kw.get("version"),
+        "recipe": recipe,
-           "level": kw.get("level", 5), "screenshot": kw.get("screenshot", "screenshot.png"),
+        "finished": finished,
-           "results": kw.get("results", {"install": "pass"}), "flags": kw.get("flags", {})}
+        "run_id": run_id,
        "ref": kw.get("ref", "deadbeefcafe"),
        "version": kw.get("version"),
        "level": kw.get("level", 5),
        "screenshot": kw.get("screenshot", "screenshot.png"),
        "results": kw.get("results", {"install": "pass"}),
        "flags": kw.get("flags", {}),
    }
    with open(os.path.join(d, "results.json"), "w") as fh:
        json.dump(doc, fh)
@@ -193,8 +200,12 @@ def test_history_sourced_from_local_artifacts(tmp_path, monkeypatch):
    # mixed numeric + named ids; out-of-order on disk; the timestamp MUST decide order, not the id
    _write_run(base, "753", "bsky", 1781663348, results={"install": "pass"})
    _write_run(base, "427", "bsky", 1781178768, results={"install": "pass"})
-    _write_run(base, "m2r-bsky", "bsky", 1781121610, level=0, results={"install": "pass", "backup": "fail"})
+    _write_run(
-    _write_run(base, "423", "bsky", 1781178063, results={"install": "pass"})  # 423<427 numerically but OLDER
+        base, "m2r-bsky", "bsky", 1781121610, level=0, results={"install": "pass", "backup": "fail"}
    )
    _write_run(
        base, "423", "bsky", 1781178063, results={"install": "pass"}
    )  # 423<427 numerically but OLDER
    _write_run(base, "9", "other", 1781000000)  # different recipe, must not leak in
    # graceful-skip cases (the host's in-flight/failed-early dirs)
    os.makedirs(os.path.join(base, "EMPTY"), exist_ok=True)  # in-flight dir, no results.json
@@ -66,7 +66,7 @@ def _load_conftest():
 class _FakeItem:
    def __init__(self, keywords):
        # pytest `item.keywords` supports `in`; a dict suffices.
-        self.keywords = {k: True for k in keywords}
+        self.keywords = dict.fromkeys(keywords, True)
        self.markers = []
    def add_marker(self, mark):
@@ -176,6 +176,5 @@ def test_scm_redirect_assertions(location_url, gitea_domain, client_id, expect_p
    ]
    all_pass = all(checks)
    assert all_pass == expect_pass, (
-        f"Expected {'pass' if expect_pass else 'fail'} for URL {location_url!r}; "
+        f"Expected {'pass' if expect_pass else 'fail'} for URL {location_url!r}; checks: {checks}"
        f"checks: {checks}"
    )
@@ -42,9 +42,9 @@ def test_uptime_kuma_spa_has_branding(live_app):
    body = harness_http.assert_converges(_ready, f"GET {url}", max_wait=60, interval=3)
    lower = body.lower()
-    assert (
+    assert "uptime kuma" in lower or "kuma" in lower, (
-        "uptime kuma" in lower or "kuma" in lower
+        f"Page body has no 'kuma' brand. Excerpt: {body[:200]!r}"
-    ), f"Page body has no 'kuma' brand. Excerpt: {body[:200]!r}"
+    )
    # SPA-bundle markers: at least one of these reference paths should be present
    bundle_markers = ("/assets/", "/icon.svg", "favicon", "main.")
    present = [m for m in bundle_markers if m in body]
Author	SHA1	Message	Date
notplantsandClaude Fable 5.1	c0d233174c	acme-dns.nix: one `systemd` attrset (statix W20) — lint gate green continuous-integration/drone/push Build is passing Details statix flagged the repeated `systemd.` keys (tmpfiles marker, acme-dns daemon, traefik handoff oneshot); they are now one nested attrset. Purely structural: `#cc-ci` still evaluates. With #33 this makes the push self-test's lint stage pass again. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqkQq3CDmFWcQ7u1LzoyRz	2026-09-07 21:17:50 +00:00
autonomic-bot	6d1e2b903d	Merge pull request 'lint: ruff format + one auto-fix so the push self-test is green again' (#33 ) from chore/lint-fix into main continuous-integration/drone/push Build is failing Details lint: ruff format + one auto-fix so the push self-test is green again (#33)	2026-09-07 21:15:07 +00:00
notplantsandClaude Fable 5.1	9a80002b37	lint: ruff format + one auto-fix so the push self-test is green again continuous-integration/drone/push Build is failing Details `scripts/lint.sh --fix` from the pinned lint devshell: 90 Python files reformatted (ruff format, mechanical) and one C420 (dict comprehension → dict.fromkeys) in tests/unit/test_f211_sso_skip.py. The push self-test had been failing at the lint stage since build 1313 (2026-08-31) on exactly these files; nothing else changed. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqkQq3CDmFWcQ7u1LzoyRz	2026-09-07 21:15:05 +00:00
autonomic-bot	f6dbfa3689	Merge pull request 'nix: export the CI server as nixosModules.cc-ci-server' (#32 ) from feat/nixos-module-export into main continuous-integration/drone Build is passing Details continuous-integration/drone/push Build is failing Details nix: export the CI server as nixosModules.cc-ci-server (#32)	2026-09-07 20:13:24 +00:00
notplantsandClaude Fable 5.1	9b99f81f5f	nix: export the CI server as nixosModules.cc-ci-server continuous-integration/drone/push Build is failing Details The whole server (every service module, the harness tooling, sops wiring, acme-dns) becomes one reusable module, nix/modules/default.nix, so another flake can run cc-ci on a host it defines. First consumer: the cc-ci-orchestrator repo's `#cc-ci` host, which runs the CI server and the orchestrator together on one Hetzner machine. Two things the modules hard-coded become options (nix/modules/options.nix): - cc-ci.publicIPv4 — acme-dns's listen address and ns-acme glue record. - cc-ci.sopsFile — the secrets.yaml path; defaults to the secrets/ submodule, but a consumer that imports cc-ci as a plain input (no private submodule) points it at the deployed --recursive checkout and sops-nix reads it at activation (validateSopsFiles off for that case). The standalone host (nix/hosts/cc-ci-hetzner) now only carries hardware, networking and identity and imports the module via the flake. Verified: the `#cc-ci` system derivation is byte-identical before and after (/nix/store/ckp1244bz86fz3qbx81n5kx60c1lak3m-…531670d.drv on both). Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01FqkQq3CDmFWcQ7u1LzoyRz	2026-09-07 19:56:58 +00:00
autonomic-bot	769fd29dcf	fix: publish Gitea URL configuration continuous-integration/drone/push Build is failing Details continuous-integration/drone Build is passing Details Verified during the successful weekly run.	2026-08-31 20:46:32 +00:00