test: drop 'After=multi-user.target' from most of testsuite.service

diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh
index 80e5fb0a738d7412f427e9b938a95f8322460265..33bfcbf681a4320ae5071dc17bcd17a9fca8b8d3 100755 (executable)
--- a/test/TEST-04-JOURNAL/test.sh
+++ b/test/TEST-04-JOURNAL/test.sh
@@ -30,7 +30,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-journal.sh

diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh
index 711f87f585b6e6b12b074933e2dd92e8120a2eda..3eb21657968496110bdff0046cafdbcccefc7524 100755 (executable)
--- a/test/TEST-05-RLIMITS/test.sh
+++ b/test/TEST-05-RLIMITS/test.sh
@@ -35,7 +35,6 @@ EOF
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-rlimits.sh

diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh
index 604ede5b2b95c461b412ed8fd69ef81567fca8d5..0c924ecbbdd7d498a69812013094b76a553bcd2a 100755 (executable)
--- a/test/TEST-06-SELINUX/test.sh
+++ b/test/TEST-06-SELINUX/test.sh
@@ -33,7 +33,6 @@ test_setup() {
         cat <<EOF >$initdir/etc/systemd/system/testsuite.service
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-selinux-checks.sh

diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh
index 8d3ed04712a9b937fe9508b22294771338c088c8..499a36038c621600546384f44acf588386af63ee 100755 (executable)
--- a/test/TEST-07-ISSUE-1981/test.sh
+++ b/test/TEST-07-ISSUE-1981/test.sh
@@ -33,7 +33,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-segfault.sh

diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh
index 90bf133c6a30da1dbfe0cb21b2f3b65e65a16c92..b01df3656b716efd1b57db0727185e81f0cc6527 100755 (executable)
--- a/test/TEST-08-ISSUE-2730/test.sh
+++ b/test/TEST-08-ISSUE-2730/test.sh
@@ -25,7 +25,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/bin/sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK > /testok; systemctl poweroff'

diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh
index 40eac300764e96c221fd0213c32f2bcff1a18736..01eb4dbac89621747c22c672647316879a898c6f 100755 (executable)
--- a/test/TEST-09-ISSUE-2691/test.sh
+++ b/test/TEST-09-ISSUE-2691/test.sh
@@ -24,7 +24,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 Type=oneshot

diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh
index e61f5acd3c8bb7d8e5e9f9ec7caa80fa26dbcb10..d8959187a1f215fe1b2cb369abba093d1a35aee7 100755 (executable)
--- a/test/TEST-10-ISSUE-2467/test.sh
+++ b/test/TEST-10-ISSUE-2467/test.sh
@@ -23,7 +23,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<'EOF'
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 Type=oneshot

diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh
index e6e96101aab448ba1a5b6087ec341f2f2802a2f4..6cde7fd7eaa89f6ac7c3fe29d6ad3249bef264e5 100755 (executable)
--- a/test/TEST-11-ISSUE-3166/test.sh
+++ b/test/TEST-11-ISSUE-3166/test.sh
@@ -32,7 +32,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-fail-on-restart.sh

diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh
index 915cc21cd817104fa92d11ce5d6369f1d8564a95..0c267e11a6c79f483c3e72e65e08f5aea71cff9a 100755 (executable)
--- a/test/TEST-12-ISSUE-3171/test.sh
+++ b/test/TEST-12-ISSUE-3171/test.sh
@@ -39,7 +39,6 @@ ExecStart=/test-socket-group.sh
 Type=oneshot
 EOF
 
-
         cat >$initdir/test-socket-group.sh <<'EOF'
 #!/bin/bash
 set -x

diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh
index 0659a68cf0f772b434ec6f99839db8c51be862c6..75e214c0088b18298be1a92d42fe4bc7eedf1585 100755 (executable)
--- a/test/TEST-13-NSPAWN-SMOKE/test.sh
+++ b/test/TEST-13-NSPAWN-SMOKE/test.sh
@@ -37,7 +37,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-nspawn.sh

diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh
index 62003b91b60a936668bff19b6fcad817b7398a93..94358342047cad33790903470cf521e241b0a68b 100755 (executable)
--- a/test/TEST-14-MACHINE-ID/test.sh
+++ b/test/TEST-14-MACHINE-ID/test.sh
@@ -25,7 +25,6 @@ test_setup() {
         cat >$initdir/etc/systemd/system/testsuite.service <<EOF
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/bin/sh -e -x -c '/test-machine-id-setup.sh; systemctl --state=failed --no-legend --no-pager > /failed ; echo OK > /testok'

diff --git a/test/TEST-15-DROPIN/testsuite.service b/test/TEST-15-DROPIN/testsuite.service
index d9790c261023353fea55941bda0010d72cec7105..4c9f65e2b1e8873871062520ad810db270f556ea 100644 (file)
--- a/test/TEST-15-DROPIN/testsuite.service
+++ b/test/TEST-15-DROPIN/testsuite.service
@@ -1,6 +1,5 @@
 [Unit]
 Description=Testsuite service
-After=multi-user.target
 
 [Service]
 ExecStart=/test-dropin.sh

diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/TEST-22-TMPFILES/testsuite.service
index 123b12790ff3e7ea858ad4669ef449164ff15175..a19174e7952872d2cd41aaef1e61a963d3264f76 100644 (file)
--- a/test/TEST-22-TMPFILES/testsuite.service
+++ b/test/TEST-22-TMPFILES/testsuite.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Testsuite service
-After=multi-user.target
+After=systemd-tmpfiles-setup.service
 
 [Service]
 WorkingDirectory=/testsuite