Quickshell watches the QML it loaded and reloads on change, so pacman replacing /usr/share/omarchy/shell mid-transaction makes the running shell reload against a half-written tree. That reload fails, and a failure that reaches the config load is not harmless: it raises the reload popup, which is a second engine generation. EngineGeneration::currentGeneration() returns null unless exactly one exists, so the IPC kill that omarchy-update sends moments later takes the QCoreApplication::exit(0) branch instead of the generation's own quit, and Quickshell tears the QML graph down after deleting the QGuiApplication. The first GUI resource touched on the way out aborts: FATAL: QPixmap: Must construct a QGuiApplication before a QPixmap The user gets the crash dialog after an update and a coredump per occurrence. Reported in #6748 with 3 crashes across 10 updates, always following a failed reload. Fixing this in omarchy-update — stopping the shell around the pacman step — would cover one caller and cost the polkit agent and the notification server for the length of the transaction, which the migrations that run next still notify through. It would also have to carry omarchy-restart-shell's refusal to restart a locked session, or reintroduce the hazard that refusal exists for. And omarchy-update is not the only thing that rewrites the tree. The pacman guard turns away a bare pacman -Syu, but nothing turns away a targeted pacman -S omarchy, a pacman -U of a locally built package, the documented OMARCHY_ALLOW_DIRECT_PACMAN bypass, omarchy-dev-pkg-test, or a checkout in a dev-linked tree. Turn the watcher off instead. Omarchy has never reloaded through it: omarchy-restart-shell is what picks up QML changes, and config and plugin changes go through the shell's own IPC. Third-party plugin hot reload is PluginRegistry's own inotifywait and FileView watches its own files, neither of which this touches — QuickshellSettings::watchFiles() gates the config scanner and nothing else. The popup goes off with it, because QML can still ask for a reload directly and leave the same extra generation behind. Environment reaches Quickshell only at launch, so the update that delivers this still runs under a watching shell. It takes effect from the next one. Verified against an isolated instance: breaking a config in place and then sending the IPC kill reproduces the FATAL, and it stops with either variable set. QS_DISABLE_FILE_WATCHER also keeps the failed reload from happening at all. Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
205 lines
6.9 KiB
Bash
Executable File
205 lines
6.9 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -euo pipefail
|
|
|
|
source "$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)/base-test.sh"
|
|
|
|
test_tmp=$(mktemp -d)
|
|
launch_pid=""
|
|
|
|
# A supervisor that fails to stop would hang the run instead of failing it.
|
|
cleanup() {
|
|
if [[ -n $launch_pid ]]; then
|
|
pkill -TERM -P "$launch_pid" 2>/dev/null || true
|
|
kill -KILL "$launch_pid" 2>/dev/null || true
|
|
wait "$launch_pid" 2>/dev/null || true
|
|
fi
|
|
rm -rf "$test_tmp"
|
|
}
|
|
trap cleanup EXIT
|
|
|
|
fake_bin="$test_tmp/bin"
|
|
shell_root="$test_tmp/root"
|
|
mkdir -p "$fake_bin" "$shell_root/shell"
|
|
|
|
# Each launch consumes the next status from OMARCHY_TEST_QS_STATUSES; "run"
|
|
# stands in for a healthy shell that keeps going until stopped.
|
|
cat >"$fake_bin/quickshell" <<'SH'
|
|
#!/bin/bash
|
|
|
|
printf '%s\n' "$*" >>"$OMARCHY_TEST_QS_LOG"
|
|
printf 'watcher=%s popup=%s\n' \
|
|
"${QS_DISABLE_FILE_WATCHER:-unset}" "${QS_NO_RELOAD_POPUP:-unset}" >>"$OMARCHY_TEST_QS_ENV_LOG"
|
|
|
|
launches=$(wc -l <"$OMARCHY_TEST_QS_LOG")
|
|
status=$(awk -v n="$launches" 'NR == n { print; found = 1 } END { if (!found) print "0" }' <<<"$OMARCHY_TEST_QS_STATUSES")
|
|
|
|
if [[ $status == "run" ]]; then
|
|
trap 'touch "$OMARCHY_TEST_QS_TERMINATED"; exit 143' TERM
|
|
while true; do sleep 0.05; done
|
|
fi
|
|
|
|
exit "${status:-0}"
|
|
SH
|
|
|
|
cat >"$fake_bin/systemd-cat" <<'SH'
|
|
#!/bin/bash
|
|
|
|
while (( $# > 0 )); do
|
|
[[ $1 == "--" ]] && { shift; break; }
|
|
shift
|
|
done
|
|
exec "$@"
|
|
SH
|
|
|
|
cat >"$fake_bin/hyprctl" <<'SH'
|
|
#!/bin/bash
|
|
|
|
[[ ${OMARCHY_TEST_COMPOSITOR_GONE:-0} == 1 ]] && exit 4
|
|
|
|
# Refuse the first OMARCHY_TEST_HYPRCTL_MISSES queries, then answer.
|
|
if (( ${OMARCHY_TEST_HYPRCTL_MISSES:-0} > 0 )); then
|
|
misses=$(cat "$OMARCHY_TEST_HYPRCTL_MISS_COUNT" 2>/dev/null || printf '0')
|
|
if (( misses < OMARCHY_TEST_HYPRCTL_MISSES )); then
|
|
printf '%s\n' "$(( misses + 1 ))" >"$OMARCHY_TEST_HYPRCTL_MISS_COUNT"
|
|
exit 4
|
|
fi
|
|
fi
|
|
|
|
printf '[]\n'
|
|
SH
|
|
|
|
cat >"$fake_bin/logger" <<'SH'
|
|
#!/bin/bash
|
|
|
|
shift 2
|
|
printf '%s\n' "$*" >>"$OMARCHY_TEST_LOGGER_LOG"
|
|
SH
|
|
|
|
chmod +x "$fake_bin/quickshell" "$fake_bin/systemd-cat" "$fake_bin/hyprctl" "$fake_bin/logger"
|
|
|
|
qs_log="$test_tmp/quickshell.log"
|
|
qs_env_log="$test_tmp/quickshell-env.log"
|
|
logger_log="$test_tmp/logger.log"
|
|
qs_terminated="$test_tmp/quickshell-terminated"
|
|
hyprctl_misses="$test_tmp/hyprctl-misses"
|
|
|
|
launch_shell() {
|
|
: >"$qs_log"
|
|
: >"$qs_env_log"
|
|
: >"$logger_log"
|
|
|
|
PATH="$fake_bin:$PATH" \
|
|
OMARCHY_PATH="$shell_root" \
|
|
OMARCHY_TEST_QS_LOG="$qs_log" \
|
|
OMARCHY_TEST_QS_ENV_LOG="$qs_env_log" \
|
|
OMARCHY_TEST_QS_STATUSES="$1" \
|
|
OMARCHY_TEST_COMPOSITOR_GONE="${2:-0}" \
|
|
OMARCHY_TEST_LOGGER_LOG="$logger_log" \
|
|
OMARCHY_TEST_QS_TERMINATED="$qs_terminated" \
|
|
OMARCHY_TEST_HYPRCTL_MISSES="${3:-0}" \
|
|
OMARCHY_TEST_HYPRCTL_MISS_COUNT="$hyprctl_misses" \
|
|
timeout 30 "$ROOT/bin/omarchy-launch-shell"
|
|
}
|
|
|
|
launches() {
|
|
wc -l <"$qs_log" | tr -d ' '
|
|
}
|
|
|
|
launch_shell '0' || fail "a clean launch succeeds"
|
|
[[ $(launches) == 1 ]] || fail "a shell that exits cleanly is not relaunched" "$(<"$qs_log")"
|
|
grep -F -- "-n -p $shell_root/shell" "$qs_log" >/dev/null || fail "the shell launches from OMARCHY_PATH"
|
|
pass "a shell that exits cleanly is left alone"
|
|
|
|
# A misspelled variable would leave Quickshell hot-reloading the tree pacman
|
|
# rewrites underneath it, which is what crashes the restart that follows.
|
|
[[ $(<"$qs_env_log") == "watcher=1 popup=1" ]] ||
|
|
fail "the shell launches with Quickshell's own reloading off" "$(<"$qs_env_log")"
|
|
pass "the shell launches with Quickshell's config watcher and reload popup off"
|
|
|
|
# Qt leaves through _exit(), so Quickshell's crash handler never relaunches it.
|
|
launch_shell $'255\n0' || fail "a shell that died on a Wayland error is relaunched"
|
|
[[ $(launches) == 2 ]] || fail "the dead shell is relaunched exactly once" "$(<"$qs_log")"
|
|
grep -F 'exited with status 255' "$logger_log" >/dev/null || fail "the relaunch is recorded in the journal"
|
|
pass "a shell that dies without a signal is relaunched"
|
|
|
|
launch_shell $'255\n255\n255\n255\n255\n255\n255\n255' && fail "a shell that keeps dying is given up on"
|
|
[[ $(launches) == 6 ]] || fail "relaunches stop after the attempt budget" "$(<"$qs_log")"
|
|
grep -F 'Giving up' "$logger_log" >/dev/null || fail "giving up is recorded in the journal"
|
|
pass "a shell that keeps dying is not relaunched forever"
|
|
|
|
# The compositor takes the shell with it, and the session is already going.
|
|
launch_shell $'255\n0' 1 || fail "a shell outliving the compositor exits cleanly"
|
|
[[ $(launches) == 1 ]] || fail "the shell is not relaunched into a dead session" "$(<"$qs_log")"
|
|
pass "the shell is not relaunched once the compositor is gone"
|
|
|
|
# A compositor mid-modeset can miss a query without being gone.
|
|
rm -f "$hyprctl_misses"
|
|
launch_shell $'255\n0' 0 2 || fail "a shell survives a compositor that misses a query"
|
|
[[ $(launches) == 2 ]] || fail "a missed compositor query does not end supervision" "$(<"$qs_log")"
|
|
pass "a compositor too busy to answer is not mistaken for one that is gone"
|
|
|
|
# A signal mid-backoff only reaches the trap once the sleep is over.
|
|
: >"$qs_log"
|
|
: >"$qs_env_log"
|
|
: >"$logger_log"
|
|
|
|
PATH="$fake_bin:$PATH" \
|
|
OMARCHY_PATH="$shell_root" \
|
|
OMARCHY_TEST_QS_LOG="$qs_log" \
|
|
OMARCHY_TEST_QS_ENV_LOG="$qs_env_log" \
|
|
OMARCHY_TEST_QS_STATUSES=$'255\n0' \
|
|
OMARCHY_TEST_COMPOSITOR_GONE=0 \
|
|
OMARCHY_TEST_LOGGER_LOG="$logger_log" \
|
|
OMARCHY_TEST_QS_TERMINATED="$qs_terminated" \
|
|
"$ROOT/bin/omarchy-launch-shell" &
|
|
launch_pid=$!
|
|
|
|
for (( waited = 0; waited < 100; waited++ )); do
|
|
[[ $(launches) == 1 ]] && break
|
|
sleep 0.05
|
|
done
|
|
[[ $(launches) == 1 ]] || fail "the supervised shell launched before the signal" "$(<"$qs_log")"
|
|
|
|
kill -TERM "$launch_pid"
|
|
wait "$launch_pid" || fail "a signalled supervisor exits cleanly"
|
|
launch_pid=""
|
|
[[ $(launches) == 1 ]] || fail "the shell is not relaunched after the session asked to stop" "$(<"$qs_log")"
|
|
pass "a signal during backoff stops the supervisor before it relaunches"
|
|
|
|
# Stopping the launcher used to stop the shell, back when it exec'd Quickshell.
|
|
: >"$qs_log"
|
|
: >"$qs_env_log"
|
|
: >"$logger_log"
|
|
rm -f "$qs_terminated"
|
|
|
|
PATH="$fake_bin:$PATH" \
|
|
OMARCHY_PATH="$shell_root" \
|
|
OMARCHY_TEST_QS_LOG="$qs_log" \
|
|
OMARCHY_TEST_QS_ENV_LOG="$qs_env_log" \
|
|
OMARCHY_TEST_QS_STATUSES='run' \
|
|
OMARCHY_TEST_COMPOSITOR_GONE=0 \
|
|
OMARCHY_TEST_LOGGER_LOG="$logger_log" \
|
|
OMARCHY_TEST_QS_TERMINATED="$qs_terminated" \
|
|
"$ROOT/bin/omarchy-launch-shell" &
|
|
launch_pid=$!
|
|
|
|
for (( waited = 0; waited < 100; waited++ )); do
|
|
[[ $(launches) == 1 ]] && break
|
|
sleep 0.05
|
|
done
|
|
[[ $(launches) == 1 ]] || fail "the healthy shell launched before the signal" "$(<"$qs_log")"
|
|
|
|
kill -TERM "$launch_pid"
|
|
for (( waited = 0; waited < 100; waited++ )); do
|
|
kill -0 "$launch_pid" 2>/dev/null || break
|
|
sleep 0.05
|
|
done
|
|
kill -0 "$launch_pid" 2>/dev/null && fail "a signalled supervisor stops instead of waiting on a live shell"
|
|
wait "$launch_pid" 2>/dev/null || true
|
|
launch_pid=""
|
|
|
|
[[ -f $qs_terminated ]] || fail "the running shell is signalled when the supervisor is"
|
|
[[ $(launches) == 1 ]] || fail "the signalled shell is not relaunched" "$(<"$qs_log")"
|
|
pass "stopping the supervisor stops the shell it is watching"
|