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 5efb9cc38366d699d00b5c4dfd3b7c996a3bcc0f..8fe6575834c94109485e1277d3f0e8f4c967332b 100644 (file)
--- 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 5dc00f48625017d2f5c527cd174f24d4979de4ad..ea718fa37c22a1537d070deb2129010bcfc4b72a 100755 (executable)
--- 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