From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 14 May 2024 07:20:21 +0000 (+0200)
Subject: TEST-46-HOMED: Simplify service unit
X-Git-Tag: v256-rc2~18^2~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20e94309a741fe542997d751fbc058f296fd6676;p=thirdparty%2Fsystemd.git

TEST-46-HOMED: Simplify service unit

Let's remove the unneeded NotifyAccess=all and start the socket
and service in the test itself instead of via the service unit. This
makes the test unit identical to the other test units which will allow
us to autogenerate it in a later commit.
---

diff --git a/test/units/TEST-46-HOMED.service b/test/units/TEST-46-HOMED.service
index 5efb9cc3836..8fe6575834c 100644
--- a/test/units/TEST-46-HOMED.service
+++ b/test/units/TEST-46-HOMED.service
@@ -3,11 +3,8 @@
 Description=TEST-46-HOMED
 Wants=getty-pre.target
 Before=getty-pre.target
-Requires=systemd-homed.service systemd-userdbd.socket
-After=systemd-homed.service systemd-userdbd.socket
 
 [Service]
 ExecStartPre=rm -f /failed /testok
 ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
 Type=oneshot
-NotifyAccess=all
diff --git a/test/units/TEST-46-HOMED.sh b/test/units/TEST-46-HOMED.sh
index 5dc00f48625..ea718fa37c2 100755
--- a/test/units/TEST-46-HOMED.sh
+++ b/test/units/TEST-46-HOMED.sh
@@ -35,6 +35,8 @@ wait_for_state() {
 
 FSTYPE="$(stat --file-system --format "%T" /)"
 
+systemctl start systemd-homed.service systemd-userdbd.socket
+
 systemd-analyze log-level debug
 systemctl service-log-level systemd-homed debug