diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-16 18:50:43 +0200 |
---|---|---|
committer | Frantisek Sumsal <frantisek@sumsal.cz> | 2023-05-16 22:43:52 +0200 |
commit | 1fd24da61687a03ec826dd6571309a7d15aceb3f (patch) | |
tree | 4c3fac81325bd6ac7517f89395fa7d9de838f865 | |
parent | 9245eb3cbd8cf014744ef814f292d88e95c935a5 (diff) | |
download | systemd-1fd24da61687a03ec826dd6571309a7d15aceb3f.tar.gz |
test: merge TEST-33-CLEAN-UNIT into TEST-23-UNIT-FILE
l--------- | test/TEST-33-CLEAN-UNIT/Makefile | 1 | ||||
-rwxr-xr-x | test/TEST-33-CLEAN-UNIT/test.sh | 12 | ||||
-rwxr-xr-x | test/units/testsuite-23.clean-unit.sh (renamed from test/units/testsuite-33.sh) | 6 | ||||
-rw-r--r-- | test/units/testsuite-33.service | 8 |
4 files changed, 2 insertions, 25 deletions
diff --git a/test/TEST-33-CLEAN-UNIT/Makefile b/test/TEST-33-CLEAN-UNIT/Makefile deleted file mode 120000 index e9f93b1104..0000000000 --- a/test/TEST-33-CLEAN-UNIT/Makefile +++ /dev/null @@ -1 +0,0 @@ -../TEST-01-BASIC/Makefile
\ No newline at end of file diff --git a/test/TEST-33-CLEAN-UNIT/test.sh b/test/TEST-33-CLEAN-UNIT/test.sh deleted file mode 100755 index dae72d98ef..0000000000 --- a/test/TEST-33-CLEAN-UNIT/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 CleanUnit" - -# shellcheck source=test/test-functions -. "${TEST_BASE_DIR:?}/test-functions" - -do_test "$@" diff --git a/test/units/testsuite-33.sh b/test/units/testsuite-23.clean-unit.sh index d48bef73b4..81f180a1e2 100755 --- a/test/units/testsuite-33.sh +++ b/test/units/testsuite-23.clean-unit.sh @@ -5,6 +5,8 @@ set -eux set -o pipefail +# Test unit configuration/state/cache/log/runtime data cleanup + cat >/run/systemd/system/test-service.service <<EOF [Service] ConfigurationDirectory=test-service @@ -314,7 +316,3 @@ test ! -e /run/test-socket test ! -e /var/lib/test-socket test ! -e /var/cache/test-socket test ! -e /var/log/test-socket - -echo OK >/testok - -exit 0 diff --git a/test/units/testsuite-33.service b/test/units/testsuite-33.service deleted file mode 100644 index 582cdb180c..0000000000 --- a/test/units/testsuite-33.service +++ /dev/null @@ -1,8 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -[Unit] -Description=TEST-33-CLEAN-UNIT - -[Service] -ExecStartPre=rm -f /failed /testok -ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh -Type=oneshot |