test: Move getty-pre.target logic into integration-test-wrapper.py

DaanDeMeyer · bluca · commit 3e474451a850 · 2025-03-04T21:28:53.000Z
Also pull in getty-pre.target via Wants= so it actually gets pulled into the transaction. (cherry picked from commit 854a8c2)
diff --git a/test/TEST-07-PID1/TEST-07-PID1.service b/test/TEST-07-PID1/TEST-07-PID1.service
@@ -3,7 +3,6 @@
 Description=TEST-07-PID1
 Wants=basic.target multi-user.target
 After=basic.target
-Before=getty-pre.target
 
 [Service]
 Type=oneshot
diff --git a/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.service b/test/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.service
@@ -5,7 +5,6 @@ Description=TEST-16-EXTEND-TIMEOUT
 
 Wants=basic.target multi-user.target
 After=basic.target
-Before=getty-pre.target
 
 Wants=success-all.service
 Wants=success-start.service
diff --git a/test/TEST-44-LOG-NAMESPACE/TEST-44-LOG-NAMESPACE.service b/test/TEST-44-LOG-NAMESPACE/TEST-44-LOG-NAMESPACE.service
@@ -3,7 +3,6 @@
 Description=TEST-44-LOG-NAMESPACE
 Wants=basic.target multi-user.target systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
 After=basic.target systemd-journald@foobar.socket systemd-journald-varlink@foobar.socket
-Before=getty-pre.target
 
 [Service]
 ExecStartPre=rm -f /failed /testok
diff --git a/test/TEST-69-SHUTDOWN/TEST-69-SHUTDOWN.service b/test/TEST-69-SHUTDOWN/TEST-69-SHUTDOWN.service
@@ -3,7 +3,6 @@
 Description=TEST-69-SHUTDOWN
 Wants=basic.target multi-user.target
 After=basic.target
-Before=getty-pre.target
 
 ConditionPathExists=/usr/bin/python3
 
diff --git a/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service b/test/TEST-82-SOFTREBOOT/TEST-82-SOFTREBOOT.service
@@ -4,7 +4,6 @@ Description=TEST-82-SOFTREBOOT
 DefaultDependencies=no
 Wants=basic.target multi-user.target
 After=basic.target
-Before=getty-pre.target
 
 [Service]
 Type=oneshot
diff --git a/test/integration-test-wrapper.py b/test/integration-test-wrapper.py
@@ -454,7 +454,8 @@ def main() -> None:
         dropin += textwrap.dedent(
             """
             [Unit]
-            Wants=multi-user.target
+            Wants=multi-user.target getty-pre.target
+            Before=getty-pre.target
             """
         )
 
diff --git a/test/test.service.in b/test/test.service.in
@@ -3,7 +3,6 @@
 Description=%N
 Wants=basic.target network.target @wants@
 After=basic.target network.target @after@
-Before=getty-pre.target
 
 [Service]
 ExecStartPre=rm -f /failed /testok

Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,8 @@ def main() -> None:`
`454`	`454`	`dropin += textwrap.dedent(`
`455`	`455`	`"""`
`456`	`456`	`[Unit]`
`457`		`- Wants=multi-user.target`
	`457`	`+ Wants=multi-user.target getty-pre.target`
	`458`	`+ Before=getty-pre.target`
`458`	`459`	`"""`
`459`	`460`	`)`
`460`	`461`