From c52381f09225e4a6956c272dff0d5ef706985ae0 Mon Sep 17 00:00:00 2001
From: Afonso Oliveira <afonso.oliveira707@gmail.com>
Date: Sun, 6 Sep 2026 22:32:34 +0100
Subject: [PATCH] Keep update regressions isolated from host authentication

---
 test/shell.d/fixtures/sudo-boundary-test.sh |  4 ++--
 test/shell.d/update-disk-space-test.sh      | 20 ++++++++++++--------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/test/shell.d/fixtures/sudo-boundary-test.sh b/test/shell.d/fixtures/sudo-boundary-test.sh
index cabad278..6c6bada3 100644
--- a/test/shell.d/fixtures/sudo-boundary-test.sh
+++ b/test/shell.d/fixtures/sudo-boundary-test.sh
@@ -48,7 +48,7 @@ if [[ ${1:-} == "-h" ]]; then
 fi
 if [[ ${1:-} == "-k" || ${1:-} == "-K" ]]; then
   [[ ${SUDO_TEST_REVOKE_FAIL:-0} != "1" ]] || exit 1
-  rm -f "$SUDO_TEST_CACHE"
+  /usr/bin/rm -f "$SUDO_TEST_CACHE"
   exit 0
 fi
 if [[ ${1:-} == "-N" ]]; then
@@ -115,7 +115,7 @@ ln -s ../bin/test-step "$SUDO_TEST_ROOT/mock/pacman"
 
 reset_boundary() {
   : >"$SUDO_TEST_LOG"
-  rm -f "$SUDO_TEST_CACHE"
+  /usr/bin/rm -f "$SUDO_TEST_CACHE"
   unset SUDO_TEST_FAIL_STEP SUDO_TEST_SIGNAL_STEP SUDO_TEST_SUDO_FAIL SUDO_TEST_REVOKE_FAIL SUDO_TEST_UNSUPPORTED
 }
 assert_boundary_cold() {
diff --git a/test/shell.d/update-disk-space-test.sh b/test/shell.d/update-disk-space-test.sh
index 2c7368ea..e40401eb 100644
--- a/test/shell.d/update-disk-space-test.sh
+++ b/test/shell.d/update-disk-space-test.sh
@@ -9,18 +9,21 @@ unset OMARCHY_UPDATE_FORCE
 unset TEST_AVAILABLE_BYTES
 unset TEST_DF_INVALID
 
-test_tmp=$(mktemp -d)
-trap 'rm -rf "$test_tmp"' EXIT
-
-stub_bin="$test_tmp/bin"
-test_home="$test_tmp/home"
+source "$SHELL_TEST_DIR/fixtures/sudo-boundary-test.sh"
+test_tmp="$boundary_tmp"
+stub_bin="$SUDO_TEST_ROOT/bin"
+test_home="$SUDO_TEST_HOME"
 runtime_dir="$test_tmp/runtime"
 snapshot_marker="$test_tmp/snapshot"
 gum_marker="$test_tmp/gum"
-mkdir -p "$stub_bin" "$test_home" "$runtime_dir"
+mkdir -p "$runtime_dir"
+for command in omarchy-update omarchy-update-requires-free-space omarchy-update-confirm; do
+  rm -f "$stub_bin/$command"
+  copy_boundary_file "bin/$command"
+done
 
 run_update() {
-  HOME="$test_home" \
+  SUDO_TEST_HOME="$test_home" \
   XDG_RUNTIME_DIR="$runtime_dir" \
   PATH="$stub_bin:$ROOT/bin:$PATH" \
   LC_ALL=C \
@@ -30,13 +33,14 @@ run_update() {
   SNAPSHOT_MARKER="$snapshot_marker" \
   GUM_MARKER="$gum_marker" \
   GUM_STATUS=${GUM_STATUS:-1} \
-    "$ROOT/bin/omarchy-update" "$@"
+    "$SUDO_TEST_ROOT/bin/omarchy-update" "$@"
 }
 
 write_stub() {
   local name="$1"
   local body="$2"
 
+  rm -f "$stub_bin/$name"
   cat >"$stub_bin/$name" <<SH
 #!/bin/bash
 $body