From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 13 Dec 2023 05:28:00 +0000 (+0900)
Subject: test: mask mdmonitor when building image
X-Git-Tag: v256-rc1~1473^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0f236e8cd6309cdc392d9e62bc545dcd497a9c50;p=thirdparty%2Fsystemd.git

test: mask mdmonitor when building image

Follow-up for 22e31655f3f9f54d932d4f48b92b36698e701729.
---

diff --git a/test/test-functions b/test/test-functions
index b2a83f155bf..f613dc215da 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -1289,6 +1289,10 @@ install_mdadm() {
     for unit in "${mdadm_units[@]}"; do
         image_install "${ROOTLIBDIR:?}/$unit"
     done
+
+    # Disable the mdmonitor service, since it fails if there's no valid email address
+    # configured in /etc/mdadm.conf, which just unnecessarily pollutes the logs
+    "${SYSTEMCTL:?}" mask --root "${initdir:?}" mdmonitor.service || :
 }
 
 install_compiled_systemd() {
diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh
index 0e598cc6b3e..81edb0ab7a1 100755
--- a/test/units/testsuite-64.sh
+++ b/test/units/testsuite-64.sh
@@ -1159,10 +1159,6 @@ testcase_mdadm_lvm() {
     helper_check_device_units
 }
 
-# Disable the mdmonitor service, since it fails if there's no valid email address
-# configured in /etc/mdadm.conf, which just unnecessarily pollutes the logs
-systemctl list-unit-files mdmonitor.service >/dev/null && systemctl mask --runtime mdmonitor.service
-
 udevadm settle
 udevadm control --log-level debug
 lsblk -a