More test fixes

This commit is contained in:
2026-03-20 08:28:23 +01:00
parent de45176e6c
commit 8a7603ffcc
3 changed files with 37 additions and 11 deletions

View File

@@ -789,7 +789,7 @@ if [ "$QUICK_MODE" = false ] && [ "$ISO_PREREQS_OK" = true ]; then
"install/configs/zprofile:zprofile for target user in live rootfs"; do
fpath="${check_file%%:*}"
fdesc="${check_file##*:}"
if [ -f "$SQFS_MNT/$fpath" ]; then
if sudo test -f "$SQFS_MNT/$fpath"; then
record_test "iso.rootfs.${fpath##*/}" "pass"
else
record_test "iso.rootfs.${fpath##*/}" "fail" "Missing: ${fdesc}"
@@ -797,8 +797,8 @@ if [ "$QUICK_MODE" = false ] && [ "$ISO_PREREQS_OK" = true ]; then
done
# Check that the zprofile in the ISO has dwl auto-start
if [ -f "$SQFS_MNT/install/configs/zprofile" ]; then
if grep -q 'exec dwl' "$SQFS_MNT/install/configs/zprofile"; then
if sudo test -f "$SQFS_MNT/install/configs/zprofile"; then
if sudo grep -q 'exec dwl' "$SQFS_MNT/install/configs/zprofile"; then
record_test "iso.rootfs.zprofile_has_dwl" "pass"
else
record_test "iso.rootfs.zprofile_has_dwl" "fail" "zprofile in ISO missing 'exec dwl'"
@@ -806,14 +806,14 @@ if [ "$QUICK_MODE" = false ] && [ "$ISO_PREREQS_OK" = true ]; then
fi
# Check that dpack binary is in the ISO
if [ -f "$SQFS_MNT/usr/bin/dpack" ]; then
if sudo test -f "$SQFS_MNT/usr/bin/dpack"; then
record_test "iso.rootfs.dpack_binary" "pass"
else
record_test "iso.rootfs.dpack_binary" "fail" "dpack binary missing from ISO — installer can't use dpack"
fi
# Check that package repos are in the ISO
if [ -d "$SQFS_MNT/var/lib/dpack/repos/core" ]; then
# Check that package repos are in the ISO (use sudo — squashfs may preserve restrictive perms)
if sudo test -d "$SQFS_MNT/var/lib/dpack/repos/core"; then
record_test "iso.rootfs.repos" "pass"
else
record_test "iso.rootfs.repos" "fail" "Package repos missing from ISO"