[felixfelix-bot]

Rebase of #425's eight commits onto current main (ac5811ff), authorship preserved. 11 files, +2136/−0 — the same file set and the same insertions-only shape as #425.

Head: pr/425-clientd-rebased (base main).

Conflicts (one file)

tests/cloud-lab/README.md — a table of independent file rows: main added a conformance/ row (#503) where this branch adds test_clientd_autotopup.py. Both rows kept (union of the two sides); no other hunk needed a hand.

CHANGELOG.md and .gitignore applied clean.

One placement fix worth knowing about

Replaying the branch commit-by-commit put the two clientd entries under an ### Added deep inside v0.6.0-rc1 — the position the first of the branch's commits used. The branch's own last commit (CHANGELOG entries under [Unreleased]) moved them to ## [Unreleased] → ### Added, which is where they now sit (main gained an [Unreleased] section since this branch was written). Diff is @@ -32,6 +32,47 @@ — purely additive, nothing removed.

Verification (run here, on the rebased head)

python3 -m py_compile scripts/tollgate-clientd.py tests/clientd/test_tollgate_clientd.py \
                      tests/cloud-lab/test_clientd_autotopup.py   -> ok
bash -n tests/cloud-lab/run-clientd-scenarios.sh                  -> ok
bash -n tests/cloud-lab/fake-ndsctl-filecounters.sh               -> ok
docker compose -f tests/cloud-lab/docker-compose.yml config       -> ok
python3 -m pytest tests/clientd/ -q                               -> 43 passed in 18.53s

Not run: the cloud-lab battery itself (run-clientd-scenarios.sh, S2–S5, test_clientd_autotopup.py). It needs the docker lab up (mint + tollgate + client-ns images, live nutshell wallet), which is not available in this environment. The compose file parses; the scenarios are unexercised here.

(The suite needs tests/.env — tests/conftest.py refuses to collect without the four fleet variables (#509). Created locally from tests/.env.example; it is gitignored and not part of this PR.)

Review findings, reported not fixed

Two ruff findings in the new files, left as the author wrote them:

• F401 — scripts/tollgate-clientd.py:713: import shutil inside selftest() is unused.
• RUF059 — tests/clientd/test_tollgate_clientd.py:473: unpacked payments is never used.

Neither is a defect; both are one-line cleanups if you want them gone. Say so and I fold them in.

Merge this and #425 closes as superseded, or force-push pr/425-clientd-rebased onto feature/tollgate-clientd.

[felixfelix-bot]

Review record — self-authored PR, so the approval has to be yours (GitHub will not let the author approve their own).

Re-run at head e05cf188 (the rebased head):

python3 -m py_compile scripts/tollgate-clientd.py tests/clientd/test_tollgate_clientd.py \
                      tests/cloud-lab/test_clientd_autotopup.py     -> ok
bash -n tests/cloud-lab/run-clientd-scenarios.sh                            -> ok
bash -n tests/cloud-lab/fake-ndsctl-filecounters.sh                         -> ok
docker compose -f tests/cloud-lab/docker-compose.yml config                 -> ok
python3 -m pytest tests/clientd/ -q                                         -> 43 passed in 18.53s

Not run, stated plainly: the cloud-lab battery itself (S2–S5, test_clientd_autotopup.py) — it needs the mint/tollgate/client-ns images and a live nutshell wallet, which this environment does not have. That lane is unexercised here.

Two ruff findings left exactly as the author wrote them (neither is a defect): F401 scripts/tollgate-clientd.py:713 (import shutil unused in selftest()), RUF059 tests/clientd/test_tollgate_clientd.py:473 (unpacked payments unused).

[felixfelix-bot]

Tag legend: pre-release-safe = land before the pre-release you are testing · ready = no blocker, timing is yours · post-release = hold until after · needs-author-pass = back to the author.

TAG: pre-release-safe — additive (new script + unit suite + a cloud-lab profile); nothing in the shipped binary changes.

Changes I made, as asked (commit 091a729f, pushed to this branch):

F401  scripts/tollgate-clientd.py:713    `import shutil` in selftest() — dropped
RUF059 tests/clientd/test_tollgate_clientd.py:473,487,501
        unpacked `payments` never read — renamed; the test that DOES assert
        on `payments` (test_terminal_rejection_stops_daemon) keeps its name

Re-verified after the edit: ruff check — all checks passed; python3 -m pytest tests/clientd/ -q — 43 passed; py_compile ok. (My first pass at that rename hit the wrong occurrence and broke one test — caught by the suite, fixed function-aware, re-run green. Worth saying because the head did move.)

Not run, stated plainly: the cloud-lab battery (S2–S5, test_clientd_autotopup.py) — it needs the mint/tollgate/client-ns images and a live nutshell wallet, which this environment does not have. docker compose config parses.

The head changed (091a729f), so if you had blessed the earlier one, re-approve. Self-authored — needs your approval.