Skip to content

fix(e2e): run binary service tests with sudo -E pv #68

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
munezaclovis merged 4 commits into from
Apr 20, 2026
Merged

fix(e2e): run binary service tests with sudo -E pv #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b42ec0
fix(e2e): run binary service tests with sudo -E pv
github-actions[bot] Apr 20, 2026
66cc096
fix(e2e): retry daemon-status.json check after service:add
github-actions[bot] Apr 20, 2026
348275e
fix(e2e): stop running daemon before foreground start in start-curl.sh
github-actions[bot] Apr 20, 2026
d6d0b75
fix(e2e): use sudo -E for pv link in mail-binary.sh
github-actions[bot] Apr 20, 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
33 changes: 18 additions & 15 deletions scripts/e2e/mail-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ source "$(dirname "$0")/helpers.sh"

echo "==> Phase: Mail binary service (Mailpit) lifecycle"

# Start pv in the background so we have a live daemon for service: commands.
pv start >/tmp/pv-mail-e2e.log 2>&1 &
# e2e tests use foreground mode with sudo (previous phases leave root-owned
# config dirs; only root can clean and regenerate them).
sudo -E pv start >/tmp/pv-mail-e2e.log 2>&1 &
START_PID=$!
sleep 3
sleep 8

cleanup() {
pv unlink e2e-mail-env >/dev/null 2>&1 || true
kill "$START_PID" 2>/dev/null || true
pv stop >/dev/null 2>&1 || true
sudo -E pv unlink e2e-mail-env >/dev/null 2>&1 || true
sudo -E pv stop >/dev/null 2>&1 || true
rm -rf "${ENVTEST_DIR:-}" 2>/dev/null || true
}
trap cleanup EXIT
Expand All @@ -23,20 +23,23 @@ echo '{"require":{"php":"^8.2","laravel/framework":"^11.0"}}' > "$ENVTEST_DIR/co
mkdir -p "$ENVTEST_DIR/public"
echo '<?php echo "test";' > "$ENVTEST_DIR/public/index.php"
echo "MAIL_MAILER=log" > "$ENVTEST_DIR/.env"
pv link "$ENVTEST_DIR" --name e2e-mail-env >/dev/null 2>&1 || { echo "FAIL: pv link for env test"; exit 1; }
sudo -E pv link "$ENVTEST_DIR" --name e2e-mail-env >/dev/null 2>&1 || { echo "FAIL: pv link for env test"; exit 1; }

echo "==> service:add mail"
pv service:add mail || { echo "FAIL: pv service:add mail failed"; exit 1; }
sudo -E pv service:add mail || { echo "FAIL: pv service:add mail failed"; exit 1; }

echo "==> Verify mailpit binary exists"
test -x "$HOME/.pv/internal/bin/mailpit" || { echo "FAIL: mailpit binary not installed"; exit 1; }
echo "OK: mailpit binary at ~/.pv/internal/bin/mailpit"

echo "==> Verify daemon-status.json lists mailpit"
test -f "$HOME/.pv/daemon-status.json" || { echo "FAIL: daemon-status.json missing"; exit 1; }
grep -q '"mailpit"' "$HOME/.pv/daemon-status.json" || {
for i in $(seq 1 20); do
if grep -q '"mailpit"' "$HOME/.pv/daemon-status.json" 2>/dev/null; then break; fi
sleep 1
done
grep -q '"mailpit"' "$HOME/.pv/daemon-status.json" 2>/dev/null || {
echo "FAIL: daemon-status.json does not contain mailpit entry";
cat "$HOME/.pv/daemon-status.json";
cat "$HOME/.pv/daemon-status.json" 2>/dev/null || echo "(file missing)";
exit 1;
}
echo "OK: daemon-status.json advertises mailpit"
Expand All @@ -63,7 +66,7 @@ grep -q "MAIL_MAILER=smtp" "$ENVTEST_DIR/.env" || {
echo "OK: linked project .env has MAIL_MAILER=smtp"

echo "==> service:stop mail"
pv service:stop mail
sudo -E pv service:stop mail
sleep 2
if curl -fsS http://127.0.0.1:8025/livez 2>/dev/null; then
echo "FAIL: /livez still answering after service:stop"
Expand All @@ -72,7 +75,7 @@ fi
echo "OK: /livez silent after service:stop"

echo "==> service:start mail"
pv service:start mail
sudo -E pv service:start mail
for i in $(seq 1 20); do
if curl -fsS http://127.0.0.1:8025/livez 2>/dev/null; then break; fi
sleep 1
Expand All @@ -81,13 +84,13 @@ curl -fsS http://127.0.0.1:8025/livez || { echo "FAIL: /livez not reachable afte
echo "OK: /livez reachable after service:start"

echo "==> service:destroy mail"
pv service:destroy mail
sudo -E pv service:destroy mail
test ! -f "$HOME/.pv/internal/bin/mailpit" || { echo "FAIL: mailpit binary not deleted after destroy"; exit 1; }
test ! -d "$HOME/.pv/services/mail/latest/data" || { echo "FAIL: data dir not deleted after destroy"; exit 1; }
echo "OK: binary and data removed"

echo "==> pv stop"
pv stop || true
sudo -E pv stop || true
trap - EXIT

echo "OK: Mail binary service lifecycle passed"
29 changes: 16 additions & 13 deletions scripts/e2e/s3-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,32 @@ source "$(dirname "$0")/helpers.sh"

echo "==> Phase: S3 binary service (RustFS) lifecycle"

# Start pv in the background so we have a live daemon for service: commands.
pv start >/tmp/pv-s3-e2e.log 2>&1 &
# e2e tests use foreground mode with sudo (previous phases leave root-owned
# config dirs; only root can clean and regenerate them).
sudo -E pv start >/tmp/pv-s3-e2e.log 2>&1 &
START_PID=$!
sleep 3
sleep 8

cleanup() {
kill "$START_PID" 2>/dev/null || true
pv stop >/dev/null 2>&1 || true
sudo -E pv stop >/dev/null 2>&1 || true
}
trap cleanup EXIT

echo "==> service:add s3"
pv service:add s3 || { echo "FAIL: pv service:add s3 failed"; exit 1; }
sudo -E pv service:add s3 || { echo "FAIL: pv service:add s3 failed"; exit 1; }

echo "==> Verify rustfs binary exists"
test -x "$HOME/.pv/internal/bin/rustfs" || { echo "FAIL: rustfs binary not installed"; exit 1; }
echo "OK: rustfs binary at ~/.pv/internal/bin/rustfs"

echo "==> Verify daemon-status.json lists rustfs"
test -f "$HOME/.pv/daemon-status.json" || { echo "FAIL: daemon-status.json missing"; exit 1; }
grep -q '"rustfs"' "$HOME/.pv/daemon-status.json" || {
for i in $(seq 1 20); do
if grep -q '"rustfs"' "$HOME/.pv/daemon-status.json" 2>/dev/null; then break; fi
sleep 1
done
grep -q '"rustfs"' "$HOME/.pv/daemon-status.json" 2>/dev/null || {
echo "FAIL: daemon-status.json does not contain rustfs entry";
cat "$HOME/.pv/daemon-status.json";
cat "$HOME/.pv/daemon-status.json" 2>/dev/null || echo "(file missing)";
exit 1;
}
echo "OK: daemon-status.json advertises rustfs"
Expand All @@ -40,7 +43,7 @@ nc -z 127.0.0.1 9000 || { echo "FAIL: port 9000 not reachable after service:add"
echo "OK: port 9000 reachable"

echo "==> service:stop s3"
pv service:stop s3
sudo -E pv service:stop s3
sleep 2
if nc -z 127.0.0.1 9000 2>/dev/null; then
echo "FAIL: port 9000 still answering after service:stop"
Expand All @@ -49,7 +52,7 @@ fi
echo "OK: port 9000 silent after service:stop"

echo "==> service:start s3"
pv service:start s3
sudo -E pv service:start s3
for i in $(seq 1 20); do
if nc -z 127.0.0.1 9000 2>/dev/null; then break; fi
sleep 1
Expand All @@ -58,13 +61,13 @@ nc -z 127.0.0.1 9000 || { echo "FAIL: port 9000 not reachable after service:star
echo "OK: port 9000 reachable after service:start"

echo "==> service:destroy s3"
pv service:destroy s3
sudo -E pv service:destroy s3
test ! -f "$HOME/.pv/internal/bin/rustfs" || { echo "FAIL: rustfs binary not deleted after destroy"; exit 1; }
test ! -d "$HOME/.pv/services/s3/latest/data" || { echo "FAIL: data dir not deleted after destroy"; exit 1; }
echo "OK: binary and data removed"

echo "==> pv stop"
pv stop || true
sudo -E pv stop || true
trap - EXIT

echo "OK: S3 binary service lifecycle passed"
2 changes: 2 additions & 0 deletions scripts/e2e/start-curl.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ source "$(dirname "$0")/helpers.sh"

# Disable daemon if auto-enabled during install — e2e tests use foreground mode with sudo.
pv daemon:disable 2>/dev/null || true
# pv install starts the daemon immediately; stop it so the PID file is gone before we start fresh.
sudo -E pv stop >/dev/null 2>&1 || true
sleep 1

sudo -E pv start &
Expand Down
Loading