From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 15 Nov 2021 15:21:37 +0000 (+0100)
Subject: test: make homed test run in qemu
X-Git-Tag: v250-rc1~245^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F21380%2Fhead;p=thirdparty%2Fsystemd.git

test: make homed test run in qemu
---

diff --git a/test/TEST-46-HOMED/test.sh b/test/TEST-46-HOMED/test.sh
index 77259951957..216f3d2fb2e 100755
--- a/test/TEST-46-HOMED/test.sh
+++ b/test/TEST-46-HOMED/test.sh
@@ -3,9 +3,23 @@
 set -e
 
 TEST_DESCRIPTION="testing homed"
-TEST_NO_QEMU=1
+
+# Skip the qemu version of the test, unless we have btrfs
+(modprobe -nv btrfs && command -v mkfs.btrfs) || TEST_NO_QEMU=1
 
 # shellcheck source=test/test-functions
 . "${TEST_BASE_DIR:?}/test-functions"
 
+# Need loop devices for mounting images
+test_append_files() {
+    (
+        if [ "$TEST_NO_QEMU" != "1" ] ; then
+            instmods loop =block
+            install_dmevent
+            install_btrfs
+            generate_module_dependencies
+        fi
+    )
+}
+
 do_test "$@"
diff --git a/test/units/testsuite-46.sh b/test/units/testsuite-46.sh
index 72d1fd6f850..fc4fc502979 100755
--- a/test/units/testsuite-46.sh
+++ b/test/units/testsuite-46.sh
@@ -26,7 +26,9 @@ inspect() {
 systemd-analyze log-level debug
 systemd-analyze log-target console
 
-NEWPASSWORD=xEhErW0ndafV4s homectl create test-user --disk-size=20M
+# we enable --luks-discard= since we run our tests in a tight VM, hence don't
+# needlessly pressure for storage
+NEWPASSWORD=xEhErW0ndafV4s homectl create test-user --disk-size=256M --luks-discard=yes
 inspect test-user
 
 PASSWORD=xEhErW0ndafV4s homectl authenticate test-user