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.

(cherry picked from commit 854a8c21d00e070bffd0c754812b29c5a4acd324)

diff --git a/test/TEST-07-PID1/TEST-07-PID1.service b/test/TEST-07-PID1/TEST-07-PID1.service
index 53dd54cc4578a27c3acb450117aaa55a715ce885..f2c8697e5b611e75634a8d8a1f1e7bd3b68ea6f2 100644 (file)
--- 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 3be8ef50594ec498ac5c422942dc6248cf118dca..3189a2484a65f7a77030ef625cb2bb87a5b19b97 100644 (file)
--- 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 1b1dd984180ac800755670b323587f0d6655e09b..bed66fa0037679659d7a34755698c9bdf88ef336 100644 (file)
--- 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 1467f7152aa0ee5a6f714b39872ca64a91455d69..7b47b6189369a310ecb83d65becb867ab365a450 100644 (file)
--- 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 f3892a77770bc79b1567145665cc5cd77c026373..d9c45294125c84143ead7ffbc7d59b612bcf3df8 100644 (file)
--- 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 901695b9707b7ed1cf21ed0687e5d125311c54ff..e9c5a295bc455498e83eb21ac003fc2b7613b94e 100755 (executable)
--- 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 790c513da4338e7073277523eca50af9d22a42e4..77ddb8541bd9a549a096fe90bf6a515c306a509c 100644 (file)
--- 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