shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

test: merge TEST-28-PERCENTJ-WANTEDBY into TEST-23-UNIT-FILE

Browse Source
This commit is contained in:
Frantisek Sumsal 2023-05-16 19:45:56 +02:00
parent fb03fea2a2
commit 23cb7362f1
7 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/TEST-28-PERCENTJ-WANTEDBY/Makefile
View File

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

11
test/TEST-28-PERCENTJ-WANTEDBY/test.sh
View File

@ -1,11 +0,0 @@
#!/usr/bin/env bash
# SPDX-License-Identifier: LGPL-2.1-or-later
set -e
TEST_DESCRIPTION="Ensure %j Wants directives work"
RUN_IN_UNPRIVILEGED_CONTAINER=yes
# shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions"
do_test "$@"

1
test/testsuite-28.units/specifier-j-depends-wants.service → test/testsuite-23.units/testsuite-23-specifier-j-depends-wants.service
View File

@ -1,7 +1,6 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=Dependent service for percent-j specifier
After=testsuite-28-pre.service
[Service]
Type=oneshot

7
test/testsuite-28.units/specifier-j-wants.service → test/testsuite-23.units/testsuite-23-specifier-j-wants.service
View File

@ -1,11 +1,10 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=Wants with percent-j specifier
Wants=specifier-j-depends-%j.service
After=specifier-j-depends-%j.service
After=testsuite-28-pre.service
Wants=testsuite-23-specifier-j-depends-%j.service
After=testsuite-23-specifier-j-depends-%j.service
[Service]
Type=oneshot
ExecStart=test -f /tmp/test-specifier-j-%j
ExecStart=sh -c 'echo OK >/testok'
ExecStart=touch /tmp/tetsuite-23-specifier-j-done

4
test/testsuite-28.units/testsuite-28-pre.service
View File

@ -1,4 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Service]
ExecStart=rm -f /failed /testok
Type=oneshot

15
test/units/testsuite-23.percentj-wantedby.sh Executable file
View File

@ -0,0 +1,15 @@
#!/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
# Ensure %j Wants directives work
systemd-run --wait \
--property="Type=oneshot" \
--property="Wants=testsuite-23-specifier-j-wants.service" \
--property="After=testsuite-23-specifier-j-wants.service" \
true
test -f /tmp/tetsuite-23-specifier-j-done

12
test/units/testsuite-28.service
View File

@ -1,12 +0,0 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
[Unit]
Description=TEST-28-PERCENTJ-WANTEDBY
# Testsuite: Ensure %j Wants directives work
Wants=specifier-j-wants.service
After=specifier-j-wants.service
Requires=testsuite-28-pre.service
After=testsuite-28-pre.service
[Service]
ExecStart=true
Type=oneshot