Mechanical, semantics-preserving cleanup so the codebase passes the new lint stage:
- ruff format: all 32 Python files (wraps long signatures, normalizes quotes/blank lines).
- nixpkgs-fmt: modules/drone-runner.nix.
- shfmt (-i 2 -ci): scripts/*.sh.
Lint fixes (reviewed, behavior-preserving — no test weakened):
- ruff SIM105: try/except-pass -> contextlib.suppress (abra.py app_config rm; lifecycle.py janitor).
- ruff SIM115: open().read() -> with open() (run_recipe_ci.py redaction-values + gitea-token).
- statix: merge repeated sops `secrets.*` keys into one `secrets = { ... }` (comments kept);
empty fn pattern `{ ... }:` -> `_:` (packages.nix).
- deadnix: drop unused lambda args (flake `self`; configuration.nix `lib`; overlay `final` -> `_`).
Verified on cc-ci: `scripts/lint.sh` -> lint: PASS; nixosConfigurations.cc-ci evaluates;
all Python byte-compiles. The deployed bridge/dashboard/runner source changes hash (reformat),
so cc-ci will be rebuilt to the new closure in W2 before the cold D1-D10 re-verification.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
40 lines
1.5 KiB
Python
40 lines
1.5 KiB
Python
"""cryptpad — backup/restore stage (D2): write a marker into the backed-up cryptpad_data volume,
|
|
backup, mutate, restore, assert the restored state matches the pre-mutation (backed-up) state.
|
|
|
|
The cryptpad `app` service is labelled `backupbot.backup=true`, so its volumes (incl. cryptpad_data)
|
|
are backed up. Marker is checked via `exec_in_app` (data isn't HTTP-served)."""
|
|
|
|
import os
|
|
import sys
|
|
|
|
sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "runner"))
|
|
from harness import lifecycle # noqa: E402
|
|
|
|
MARKER = "/cryptpad/data/ci-marker.txt"
|
|
|
|
|
|
def test_backup_mutate_restore(deployed, meta):
|
|
domain = deployed
|
|
|
|
# 1) establish original state in the backed-up volume, then back it up
|
|
lifecycle.exec_in_app(domain, ["sh", "-c", f"echo original > {MARKER}"])
|
|
assert lifecycle.exec_in_app(domain, ["cat", MARKER]).strip() == "original"
|
|
lifecycle.backup_app(domain)
|
|
|
|
# 2) mutate state (diverge from the backup)
|
|
lifecycle.exec_in_app(domain, ["sh", "-c", f"echo mutated > {MARKER}"])
|
|
assert lifecycle.exec_in_app(domain, ["cat", MARKER]).strip() == "mutated"
|
|
|
|
# 3) restore -> state returns to the backed-up "original"
|
|
lifecycle.restore_app(domain)
|
|
lifecycle.wait_healthy(
|
|
domain,
|
|
ok_codes=tuple(meta["HEALTH_OK"]),
|
|
path=meta["HEALTH_PATH"],
|
|
deploy_timeout=meta["DEPLOY_TIMEOUT"],
|
|
http_timeout=meta["HTTP_TIMEOUT"],
|
|
)
|
|
assert (
|
|
lifecycle.exec_in_app(domain, ["cat", MARKER]).strip() == "original"
|
|
), "restore did not return the pre-mutation state"
|