test: merge TEST-48-START-STOP-NO-RELOAD into TEST-23-UNIT-FILE

diff --git a/test/TEST-48-START-STOP-NO-RELOAD/Makefile b/test/TEST-48-START-STOP-NO-RELOAD/Makefile
deleted file mode 120000 (symlink)
index e9f93b1..0000000
--- a/test/TEST-48-START-STOP-NO-RELOAD/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile
\ No newline at end of file

diff --git a/test/TEST-48-START-STOP-NO-RELOAD/test.sh b/test/TEST-48-START-STOP-NO-RELOAD/test.sh
deleted file mode 100755 (executable)
index 0bece7d..0000000
--- a/test/TEST-48-START-STOP-NO-RELOAD/test.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-set -e
-
-TEST_DESCRIPTION="test StartStopNoReload"
-
-# shellcheck source=test/test-functions
-. "${TEST_BASE_DIR:?}/test-functions"
-
-do_test "$@"

diff --git a/test/units/testsuite-23.start-stop-no-reload.sh b/test/units/testsuite-23.start-stop-no-reload.sh
new file mode 100755 (executable)
index 0000000..9c4f17d
--- /dev/null
+++ b/test/units/testsuite-23.start-stop-no-reload.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
+# ex: ts=8 sw=4 sts=4 et filetype=sh
+set -eux
+set -o pipefail
+
+# Test start & stop operations without daemon-reload
+
+at_exit() {
+    set +e
+
+    rm -f /run/systemd/system/testsuite-23-no-reload.{service,target}
+}
+
+trap at_exit EXIT
+
+cat >/run/systemd/system/testsuite-23-no-reload.target <<EOF
+[Unit]
+Wants=testsuite-23-no-reload.service
+EOF
+
+systemctl daemon-reload
+
+systemctl start testsuite-23-no-reload.target
+
+# The filesystem on the test image, despite being ext4, seems to have a mtime
+# granularity of one second, which means the manager's unit cache won't be
+# marked as dirty when writing the unit file, unless we wait at least a full
+# second after the previous daemon-reload.
+# May 07 23:12:20 H testsuite-48.sh[30]: + cat
+# May 07 23:12:20 H testsuite-48.sh[30]: + ls -l --full-time /etc/systemd/system/testsuite-23-no-reload.service
+# May 07 23:12:20 H testsuite-48.sh[52]: -rw-r--r-- 1 root root 50 2020-05-07 23:12:20.000000000 +0100 /
+# May 07 23:12:20 H testsuite-48.sh[30]: + stat -f --format=%t /etc/systemd/system/testsuite-23-no-reload.servic
+# May 07 23:12:20 H testsuite-48.sh[53]: ef53
+sleep 3.1
+
+cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
+[Service]
+ExecStart=/bin/sleep infinity
+EOF
+
+systemctl start testsuite-23-no-reload.service
+
+systemctl is-active testsuite-23-no-reload.service
+
+# Stop and remove, and try again to exercise https://github.com/systemd/systemd/issues/15992
+systemctl stop testsuite-23-no-reload.service
+rm -f /run/systemd/system/testsuite-23-no-reload.service
+systemctl daemon-reload
+
+sleep 3.1
+
+cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
+[Service]
+ExecStart=/bin/sleep infinity
+EOF
+
+# Start a non-existing unit first, so that the cache is reloaded for an unrelated
+# reason. Starting the existing unit later should still work thanks to the check
+# for the last load attempt vs cache timestamp.
+systemctl start testsuite-23-no-reload-nonexistent.service || true
+
+systemctl start testsuite-23-no-reload.service
+
+systemctl is-active testsuite-23-no-reload.service
+
+# Stop and remove, and try again to exercise the transaction setup code path by
+# having the target pull in the unloaded but available unit
+systemctl stop testsuite-23-no-reload.service testsuite-23-no-reload.target
+rm -f /run/systemd/system/testsuite-23-no-reload.service /run/systemd/system/testsuite-23-no-reload.target
+systemctl daemon-reload
+
+sleep 3.1
+
+cat >/run/systemd/system/testsuite-23-no-reload.target <<EOF
+[Unit]
+Conflicts=shutdown.target
+Wants=testsuite-23-no-reload.service
+EOF
+
+systemctl daemon-reload
+
+systemctl start testsuite-23-no-reload.target
+
+cat >/run/systemd/system/testsuite-23-no-reload.service <<EOF
+[Service]
+ExecStart=/bin/sleep infinity
+EOF
+
+systemctl restart testsuite-23-no-reload.target
+
+systemctl is-active testsuite-23-no-reload.service

diff --git a/test/units/testsuite-48.service b/test/units/testsuite-48.service
deleted file mode 100644 (file)
index 7476956..0000000
--- a/test/units/testsuite-48.service
+++ /dev/null
@@ -1,8 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-[Unit]
-Description=TEST-48-START-STOP-NO-RELOAD
-
-[Service]
-ExecStartPre=rm -f /failed /testok
-ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
-Type=oneshot

diff --git a/test/units/testsuite-48.sh b/test/units/testsuite-48.sh
deleted file mode 100755 (executable)
index 2b5b86f..0000000
--- a/test/units/testsuite-48.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
-
-cat >/run/systemd/system/testservice-48.target <<EOF
-[Unit]
-Wants=testservice-48.service
-EOF
-
-systemctl daemon-reload
-
-systemctl start testservice-48.target
-
-# The filesystem on the test image, despite being ext4, seems to have a mtime
-# granularity of one second, which means the manager's unit cache won't be
-# marked as dirty when writing the unit file, unless we wait at least a full
-# second after the previous daemon-reload.
-# May 07 23:12:20 H testsuite-48.sh[30]: + cat
-# May 07 23:12:20 H testsuite-48.sh[30]: + ls -l --full-time /etc/systemd/system/testservice-48.service
-# May 07 23:12:20 H testsuite-48.sh[52]: -rw-r--r-- 1 root root 50 2020-05-07 23:12:20.000000000 +0100 /
-# May 07 23:12:20 H testsuite-48.sh[30]: + stat -f --format=%t /etc/systemd/system/testservice-48.servic
-# May 07 23:12:20 H testsuite-48.sh[53]: ef53
-sleep 3.1
-
-cat >/run/systemd/system/testservice-48.service <<EOF
-[Service]
-ExecStart=/bin/sleep infinity
-EOF
-
-systemctl start testservice-48.service
-
-systemctl is-active testservice-48.service
-
-# Stop and remove, and try again to exercise https://github.com/systemd/systemd/issues/15992
-systemctl stop testservice-48.service
-rm -f /run/systemd/system/testservice-48.service
-systemctl daemon-reload
-
-sleep 3.1
-
-cat >/run/systemd/system/testservice-48.service <<EOF
-[Service]
-ExecStart=/bin/sleep infinity
-EOF
-
-# Start a non-existing unit first, so that the cache is reloaded for an unrelated
-# reason. Starting the existing unit later should still work thanks to the check
-# for the last load attempt vs cache timestamp.
-systemctl start testservice-48-nonexistent.service || true
-
-systemctl start testservice-48.service
-
-systemctl is-active testservice-48.service
-
-# Stop and remove, and try again to exercise the transaction setup code path by
-# having the target pull in the unloaded but available unit
-systemctl stop testservice-48.service testservice-48.target
-rm -f /run/systemd/system/testservice-48.service /run/systemd/system/testservice-48.target
-systemctl daemon-reload
-
-sleep 3.1
-
-cat >/run/systemd/system/testservice-48.target <<EOF
-[Unit]
-Conflicts=shutdown.target
-Wants=testservice-48.service
-EOF
-
-systemctl daemon-reload
-
-systemctl start testservice-48.target
-
-cat >/run/systemd/system/testservice-48.service <<EOF
-[Service]
-ExecStart=/bin/sleep infinity
-EOF
-
-systemctl restart testservice-48.target
-
-systemctl is-active testservice-48.service
-
-echo OK >/testok
-
-exit 0