diff --git a/tests/lifecycle/bats/fedimint.bats b/tests/lifecycle/bats/fedimint.bats index 74d9c877..1c6338ae 100644 --- a/tests/lifecycle/bats/fedimint.bats +++ b/tests/lifecycle/bats/fedimint.bats @@ -45,8 +45,12 @@ fedimint_skip_if_absent() { local total known total=$(podman ps -a --format '{{.Names}}' \ | grep -Ec '^(fedimint|fedimintd|fedimint-gateway)' || true) + # `fedimint-clientd` (the dual-ecash HTTP bridge) is a legitimate, known + # container — and the unanchored `total` regex above counts it (it starts + # with "fedimint"). It must therefore be in the known set too, or every node + # running fedimint-clientd false-fails this orphan check. known=$(podman ps -a --format '{{.Names}}' \ - | grep -Ec '^(fedimint|fedimint-gateway)$' || true) + | grep -Ec '^(fedimint|fedimint-clientd|fedimint-gateway)$' || true) [ "$total" -eq "$known" ] } diff --git a/tests/lifecycle/bats/immich.bats b/tests/lifecycle/bats/immich.bats index 3ee6b60e..b3779875 100644 --- a/tests/lifecycle/bats/immich.bats +++ b/tests/lifecycle/bats/immich.bats @@ -78,7 +78,11 @@ teardown_file() { [[ "${ARCHY_ALLOW_DESTRUCTIVE:-0}" == "1" ]] || skip "ARCHY_ALLOW_DESTRUCTIVE not set" run rpc_result package.restart '{"id":"immich"}' [ "$status" -eq 0 ] - run wait_for_container_status immich running 120 + # Restart = ordered stop+start of the whole 3-container stack (postgres→redis→ + # server, with the server doing DB-readiness + migrations on boot), so it needs + # at least as long as `start` (180s) — more, since it stops first. The old 120s + # was inconsistent with the start test and false-failed on heavily-loaded nodes. + run wait_for_container_status immich running 240 [ "$status" -eq 0 ] }