test: merge TEST-33-CLEAN-UNIT into TEST-23-UNIT-FILE

test/TEST-33-CLEAN-UNIT/Makefile

@@ -1 +0,0 @@
-../TEST-01-BASIC/Makefile

test/TEST-33-CLEAN-UNIT/test.sh

@@ -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 "$@"

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

test/units/testsuite-33.service

@@ -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