Skip to content

fix(e2e): align double-onboard stale-registry test with non-destructive status (#4578) #4672

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cv merged 4 commits into from
Jun 3, 2026
Merged

fix(e2e): align double-onboard stale-registry test with non-destructive status (#4578) #4672

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f16440d
fix(e2e): align double-onboard stale-registry test with non-destructi…
hunglp6d Jun 2, 2026
08103f1
test(e2e): reconcile double-onboard cleanup actively
sandl99 Jun 2, 2026
7e50a02
Merge branch 'main' into sdang/reopen-4635-double-onboard
sandl99 Jun 2, 2026
0d11b01
merge(main): resolve conflicts for PR 4672
cv Jun 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions test/e2e/test-double-onboard.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,6 +729,12 @@ else
fail "Stale sandbox status exited $status_exit (expected 1)"
fi

if grep -q "No local registry entry was removed" <<<"$status_output"; then
pass "Stale sandbox status emitted non-destructive guidance (#4578)"
else
fail "Stale sandbox status did not emit non-destructive guidance (#4578)"
fi

# #4497: neither status nor connect may delete the stale local entry — the
# metadata is what `rebuild` / `onboard --recreate-sandbox` need to recover.
if grep -q "Removed stale local registry entry" <<<"$status_output"; then
Expand Down Expand Up @@ -867,12 +873,10 @@ stop_gateway_runtime
openshell gateway destroy -g nemoclaw 2>/dev/null || true
openshell gateway destroy -g "$ALT_GATEWAY_NAME" 2>/dev/null || true

# Force registry reconciliation: when the gateway is in a degraded state
# (stopped in Phase 6), `nemoclaw destroy` may delete the sandbox from
# OpenShell but fail to clean its own registry entry. Running `status` for
# each sandbox triggers the stale-entry reconciliation path.
run_nemoclaw "$SANDBOX_A" status 2>/dev/null || true
run_nemoclaw "$SANDBOX_B" status 2>/dev/null || true
# `status` and `connect` intentionally preserve stale registry entries (#4497),
# so final cleanup relies on the explicit `destroy --yes` calls above. Do not
# run a post-destroy status probe here: it can restart the gateway without
# removing registry state.

if openshell sandbox get "$SANDBOX_A" >/dev/null 2>&1; then
fail "Sandbox '$SANDBOX_A' still exists after cleanup"
Expand Down
Loading