From 76d4c6c45cdbcb43d7d1e92c1d39d4c92e48ca1f Mon Sep 17 00:00:00 2001 From: Ben Vinegar <2153+benvinegar@users.noreply.github.com> Date: Sun, 8 Nov 2026 21:16:51 -0500 Subject: [PATCH] test(controller-local): match the ssh stub's readiness commands exactly The ssh stub answered "exit 0, no output" for any remote command containing 6080, cloud-init or boxery-provision. A copy's staging script carries a random 24-hex-digit id, so about one run in 3,000 the id contained 6080: the stub then pretended a missing VM had staged the copy, and cp failed with "unexpected staging response" instead of "no such vm" (seen on master, macos-shell). The stub now matches the three commands it stands in for: cloud-init status, the noVNC readiness loop and the provisioning check. None can appear in a hex id. Co-Authored-By: Claude Opus 5.5 --- test/shell/common/controller-local.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/shell/common/controller-local.sh b/test/shell/common/controller-local.sh index 88bd31a..d74dfa7 100755 --- a/test/shell/common/controller-local.sh +++ b/test/shell/common/controller-local.sh @@ -20,7 +20,8 @@ cat >"$tmp/bin/ssh" </dev/null)" = "\$port" ] && host=\$(basename "\$d"); done; fi -case "\$*" in *cloud-init*|*6080*|*boxery-provision*) exit 0 ;; esac +# the host's readiness waits, as whole commands: a copy's random staging name can contain "6080" +case "\$*" in *"cloud-init status"*|*"127.0.0.1:6080/vnc.html"*|*"/var/log/boxery-provision.ok"*) exit 0 ;; esac [ -n "\$host" ] || exit 0 vm=$tmp/vms/\$host; [ -d "\$vm" ] || { echo "no such vm" >&2; exit 255; } mkdir -p "\$vm/home/project/.git/info"