From 0e7d6c270b77d3808402a19a4754c5fd0484f0ce Mon Sep 17 00:00:00 2001 From: Omarchybot Date: Sun, 4 Oct 2026 19:30:00 +0200 Subject: [PATCH] Update test fixtures to current runtime contracts (#14259) Recent runtime changes left the aggregate suite expecting a VS Code symlink and fixed extension version, pacman arguments without the end-of-options marker, a one-argument QML text signal, and background functions without preparation state. Align these fixtures with the current interfaces while retaining palette equality, package retry, keyboard action, and missing-background recovery assertions. Co-authored-by: Omarchybot <317366263+omarchybot@users.noreply.github.com> --- test/cli | 9 +++++---- test/shell.d/fixtures/network-captive-portal/shell.qml | 2 +- test/shell.d/kernel-headers-migration-test.sh | 5 +++-- test/shell.d/omarchy-kernel-migration-test.sh | 4 ++-- test/shell.d/video-background-test.sh | 2 ++ 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/test/cli b/test/cli index 07628581..37a4ae76 100755 --- a/test/cli +++ b/test/cli @@ -609,13 +609,14 @@ EOF chmod +x "$FAKE_BIN/omarchy-toggle-enabled" mkdir -p "$PI_TMPDIR/.vscode/extensions" -echo '{"local.omarchy-theme-1.0.0":true}' >"$PI_TMPDIR/.vscode/extensions/.obsolete" +generated_version="1.0.$(cksum "$PI_TMPDIR/.local/state/omarchy/current/theme/vscode-theme.json" | cut -d' ' -f1)" +jq -n --arg key "local.omarchy-theme-$generated_version" '{($key):true}' >"$PI_TMPDIR/.vscode/extensions/.obsolete" PATH="$FAKE_BIN:$ROOT/bin:$PATH" HOME="$PI_TMPDIR" "$ROOT/bin/omarchy-theme-set-vscode" jq -e '.contributes.themes[0].uiTheme == "vs"' "$PI_TMPDIR/.vscode/extensions/omarchy-theme/package.json" >/dev/null || fail "vscode generated light theme uses VS Code light uiTheme" pass "vscode generated light theme uses VS Code light uiTheme" -[[ -L $PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json ]] || fail "vscode generated theme references current theme file" -[[ $(readlink "$PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json") == "$PI_TMPDIR/.local/state/omarchy/current/theme/vscode-theme.json" ]] || fail "vscode generated theme references current theme file" -pass "vscode generated theme references current theme file" +[[ ! -L $PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json ]] || fail "vscode generated theme survives current theme replacement" +cmp "$PI_TMPDIR/.local/state/omarchy/current/theme/vscode-theme.json" "$PI_TMPDIR/.vscode/extensions/omarchy-theme/themes/omarchy-color-theme.json" || fail "vscode generated theme contains the current palette" +pass "vscode generated theme contains a copy of the current palette" [[ ! -f $PI_TMPDIR/.vscode/extensions/.obsolete ]] || fail "vscode generated theme clears obsolete extension marker" pass "vscode generated theme clears obsolete extension marker" jq -e '.[] | select(.identifier.id == "local.omarchy-theme" and .relativeLocation == "omarchy-theme")' "$PI_TMPDIR/.vscode/extensions/extensions.json" >/dev/null || fail "vscode generated theme registers local extension" diff --git a/test/shell.d/fixtures/network-captive-portal/shell.qml b/test/shell.d/fixtures/network-captive-portal/shell.qml index 24c361bc..b72a4407 100644 --- a/test/shell.d/fixtures/network-captive-portal/shell.qml +++ b/test/shell.d/fixtures/network-captive-portal/shell.qml @@ -68,7 +68,7 @@ ShellRoot { var before = NetworkMock.checks panel.testPoll.triggered() check(NetworkMock.checks === before + 1, "background timer rechecks through NM") - panel.testKeys.textKey("r") + panel.testKeys.textKey("r", Qt.NoModifier) check(NetworkMock.checks === before + 2, "r requests fresh connectivity") // Exercise the existing cursor model, not a separate test-only action. panel.cursorActive = true diff --git a/test/shell.d/kernel-headers-migration-test.sh b/test/shell.d/kernel-headers-migration-test.sh index 458ea330..1bf9e8d5 100755 --- a/test/shell.d/kernel-headers-migration-test.sh +++ b/test/shell.d/kernel-headers-migration-test.sh @@ -13,10 +13,11 @@ export PATH="$tmp_dir/bin:$ROOT/bin:$PATH" cat > "$tmp_dir/bin/pacman" <<'SH' #!/bin/bash case "$1" in - -Q) grep -Fxq -- "$2" "$INSTALLED_PACKAGES" ;; + -Q) [[ $2 == -- ]] || exit 99; grep -Fxq -- "$3" "$INSTALLED_PACKAGES" ;; -S) [[ ${FAIL_INSTALL:-0} == 0 ]] || exit 1 - shift 3 # -S --noconfirm --needed + [[ $4 == -- ]] || exit 99 + shift 4 # -S --noconfirm --needed -- printf '%s\n' "$@" >> "$INSTALLED_PACKAGES" printf '%s\n' "$@" >> "$CALL_LOG" ;; diff --git a/test/shell.d/omarchy-kernel-migration-test.sh b/test/shell.d/omarchy-kernel-migration-test.sh index 87f8e549..2eef49fb 100644 --- a/test/shell.d/omarchy-kernel-migration-test.sh +++ b/test/shell.d/omarchy-kernel-migration-test.sh @@ -22,7 +22,7 @@ boot_order='BOOT_ORDER="linux-omarchy, linux-omarchy-*, *, *fallback, Snapshots" cat > "$scratch/bin/pacman" <<'SH' #!/bin/bash case "$1" in - -Q) grep -Fxq "$2" "$INSTALLED_PACKAGES" ;; + -Q) [[ $2 == -- ]] || exit 99; grep -Fxq -- "$3" "$INSTALLED_PACKAGES" ;; -S) printf 'pacman %s\n' "$*" >> "$CALL_LOG" [[ ${INSTALL_FAIL:-0} == "0" ]] || exit 1 @@ -154,7 +154,7 @@ for name in dell-xps-panther-lake zz-dell-xps-panther-lake; do done cp "$OMARCHY_KERNEL_LIMINE_CONF" "$OMARCHY_KERNEL_LIMINE_DROP_INS/omarchy-defaults.conf" run_migration -grep -Fxq "pacman -S --noconfirm --needed $kernel $kernel-headers" "$CALL_LOG" || fail "both new packages are installed" +grep -Fxq "pacman -S --noconfirm --needed -- $kernel $kernel-headers" "$CALL_LOG" || fail "both new packages are installed" grep -Fxq linux-ptl "$INSTALLED_PACKAGES" || fail "the old kernel is kept for recovery" grep -Fxq linux-ptl-headers "$INSTALLED_PACKAGES" || fail "the old kernel headers are kept" assert_preferred "$OMARCHY_KERNEL_LIMINE_CONF" diff --git a/test/shell.d/video-background-test.sh b/test/shell.d/video-background-test.sh index 13d2b80b..1e437e5a 100755 --- a/test/shell.d/video-background-test.sh +++ b/test/shell.d/video-background-test.sh @@ -331,6 +331,8 @@ video_snapshot=$(snapshot_background_path "$CURRENT_THEME_PATH/backgrounds/old.m CHOSEN_THEME_BACKGROUND="$transition_home/disappeared.mp4" BACKGROUND_TRANSITION_SNAPSHOTS=false OLD_BACKGROUND_SNAPSHOT="" +PREPARED_BACKGROUND="" +PREPARED_BACKGROUND_SNAPSHOT="" colors_payload="" shell_payload="" shell_ipc() { :; }