From 78e9bb837c258ac0ec7712b3d612cc2f407e731e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:50:42 +0200 Subject: Merging upstream version 256. Signed-off-by: Daniel Baumann --- .../TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service | 8 ++++++++ test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket | 5 +++++ .../TEST-03-JOBS.units/fails-on-restart-restartdirect.service | 11 +++++++++++ .../TEST-03-JOBS.units/fails-on-restart-restartdirect.target | 3 +++ test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service | 11 +++++++++++ test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target | 3 +++ test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target | 6 ++++++ test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service | 6 ++++++ .../TEST-03-JOBS.units/propagatestopto-and-pullin.target | 5 +++++ .../TEST-03-JOBS.units/propagatestopto-indirect.target | 3 +++ .../TEST-03-JOBS.units/propagatestopto-only.target | 3 +++ .../TEST-03-JOBS.units/sleep-infinity-simple.service | 7 +++++++ test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service | 7 +++++++ .../succeeds-on-restart-restartdirect.service | 6 ++++++ .../succeeds-on-restart-restartdirect.target | 3 +++ .../TEST-03-JOBS.units/succeeds-on-restart.service | 6 ++++++ test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh | 10 ++++++++++ .../TEST-03-JOBS.units/succeeds-on-restart.target | 3 +++ test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service | 6 ++++++ test/TEST-03-JOBS/meson.build | 9 +++++++++ 20 files changed, 121 insertions(+) create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service create mode 100755 test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target create mode 100644 test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service create mode 100644 test/TEST-03-JOBS/meson.build (limited to 'test/TEST-03-JOBS') diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service new file mode 100644 index 0000000..93ddb85 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.service @@ -0,0 +1,8 @@ +[Unit] +Description=Service that never leaves state ACTIVATING +Requires=always-activating.socket +After=always-activating.socket + +[Service] +Type=notify +ExecStart=bash -c 'sleep infinity' diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket new file mode 100644 index 0000000..c76fed2 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/always-activating.socket @@ -0,0 +1,5 @@ +[Unit] +Description=Socket that activates always-activating.service + +[Socket] +ListenStream=/run/test-03-always-activating.sock diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service new file mode 100644 index 0000000..60ffd7a --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.service @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Fail on restart +StartLimitIntervalSec=1m +StartLimitBurst=3 + +[Service] +Type=oneshot +ExecStart=false +Restart=on-failure +RestartMode=direct diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target new file mode 100644 index 0000000..58e2561 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart-restartdirect.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Requires=fails-on-restart-restartdirect.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service new file mode 100644 index 0000000..fb7e7ae --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.service @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Fail on restart +StartLimitIntervalSec=1m +StartLimitBurst=3 + +[Service] +Type=oneshot +ExecStart=false +Restart=on-failure +RestartMode=normal diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target new file mode 100644 index 0000000..865fb2a --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/fails-on-restart.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Requires=fails-on-restart.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target new file mode 100644 index 0000000..b0ddb30 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello-after-sleep.target @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Sleep for a minute, then say hello. +Wants=sleep.service hello.service +After=sleep.service +Before=hello.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service new file mode 100644 index 0000000..0c3f2f8 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/hello.service @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Hello World + +[Service] +ExecStart=/bin/echo "Hello World" diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target new file mode 100644 index 0000000..8e409af --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-and-pullin.target @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Requires=sleep-infinity-simple.service +After=sleep-infinity-simple.service +PropagatesStopTo=sleep-infinity-simple.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target new file mode 100644 index 0000000..e8229a7 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-indirect.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +PropagatesStopTo=propagatestopto-and-pullin.target diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target new file mode 100644 index 0000000..327b7c1 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/propagatestopto-only.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +PropagatesStopTo=sleep-infinity-simple.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service new file mode 100644 index 0000000..211346d --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep-infinity-simple.service @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Sleep infinitely + +[Service] +Type=simple +ExecStart=/bin/sleep infinity diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service new file mode 100644 index 0000000..32c2037 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/sleep.service @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Sleep for 1 minute + +[Service] +Type=oneshot +ExecStart=/bin/sleep 60 diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service new file mode 100644 index 0000000..a2b9c33 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.service @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Service] +Type=oneshot +ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh +Restart=on-failure +RestartMode=direct diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target new file mode 100644 index 0000000..2cf3c60 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart-restartdirect.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Requires=succeeds-on-restart-restartdirect.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service new file mode 100644 index 0000000..d0e9c2b --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.service @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Service] +Type=oneshot +ExecStart=/usr/lib/systemd/tests/testdata/TEST-03-JOBS.units/succeeds-on-restart.sh +Restart=on-failure +RestartMode=normal diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh new file mode 100755 index 0000000..1428b18 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later +if [[ ! -f "/succeeds-on-restart.ko" ]] +then + touch "/succeeds-on-restart.ko" + exit 1 +else + rm "/succeeds-on-restart.ko" + exit 0 +fi diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target new file mode 100644 index 0000000..eb82f47 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/succeeds-on-restart.target @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Requires=succeeds-on-restart.service diff --git a/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service b/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service new file mode 100644 index 0000000..6eb7c19 --- /dev/null +++ b/test/TEST-03-JOBS/TEST-03-JOBS.units/unstoppable.service @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/echo "I'm unstoppable!" +ExecStop=/bin/systemctl start --no-block unstoppable.service diff --git a/test/TEST-03-JOBS/meson.build b/test/TEST-03-JOBS/meson.build new file mode 100644 index 0000000..3484d21 --- /dev/null +++ b/test/TEST-03-JOBS/meson.build @@ -0,0 +1,9 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +integration_tests += [ + integration_test_template + { + 'name' : fs.name(meson.current_source_dir()), + }, +] + +testdata_subdirs += [meson.current_source_dir() / 'TEST-03-JOBS.units'] -- cgit v1.2.3