From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 3 Mar 2025 10:51:13 +0000 (+0100)
Subject: test: Move getty-pre.target logic into integration-test-wrapper.py
X-Git-Tag: v258-rc1~1192^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=854a8c21d00e070bffd0c754812b29c5a4acd324;p=thirdparty%2Fsystemd.git

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

Also pull in getty-pre.target via Wants= so it actually gets pulled
into the transaction.
---

diff --git a/test/TEST-07-PID1/TEST-07-PID1.service b/test/TEST-07-PID1/TEST-07-PID1.service
index 53dd54cc457..f2c8697e5b6 100644
--- 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
index 3be8ef50594..3189a2484a6 100644
--- 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
index 1b1dd984180..bed66fa0037 100644
--- 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
index 1467f7152aa..7b47b618936 100644
--- 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
index f3892a77770..d9c45294125 100644
--- 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
index 901695b9707..e9c5a295bc4 100755
--- 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
index 790c513da43..77ddb8541bd 100644
--- 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