From 55944e5e40b1be2afc4855d8d2baf4b73d1876b5 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 10 Apr 2024 22:49:52 +0200 Subject: Adding upstream version 255.4. Signed-off-by: Daniel Baumann --- test/testsuite-16.units/extend-timeout.sh | 63 +++++++++++++++++++++++++ test/testsuite-16.units/fail-runtime.service | 13 +++++ test/testsuite-16.units/fail-start.service | 14 ++++++ test/testsuite-16.units/fail-stop.service | 16 +++++++ test/testsuite-16.units/success-all.service | 15 ++++++ test/testsuite-16.units/success-runtime.service | 14 ++++++ test/testsuite-16.units/success-start.service | 13 +++++ test/testsuite-16.units/success-stop.service | 13 +++++ 8 files changed, 161 insertions(+) create mode 100755 test/testsuite-16.units/extend-timeout.sh create mode 100644 test/testsuite-16.units/fail-runtime.service create mode 100644 test/testsuite-16.units/fail-start.service create mode 100644 test/testsuite-16.units/fail-stop.service create mode 100644 test/testsuite-16.units/success-all.service create mode 100644 test/testsuite-16.units/success-runtime.service create mode 100644 test/testsuite-16.units/success-start.service create mode 100644 test/testsuite-16.units/success-stop.service (limited to 'test/testsuite-16.units') diff --git a/test/testsuite-16.units/extend-timeout.sh b/test/testsuite-16.units/extend-timeout.sh new file mode 100755 index 0000000..45a18b9 --- /dev/null +++ b/test/testsuite-16.units/extend-timeout.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +# SPDX-License-Identifier: LGPL-2.1-or-later +set -eux +set -o pipefail + +# sleep interval (seconds) +sleep_interval="${sleep_interval:-1}" +# extend_timeout_interval second(s) +extend_timeout_interval="${extend_timeout_interval:-1}" +# number of sleep_intervals before READY=1 +start_intervals="${start_intervals:-10}" +# number of sleep_intervals before exiting +stop_intervals="${stop_intervals:-10}" +# run intervals, number of sleep_intervals to run +run_intervals="${run_intervals:-7}" + +# We convert to usec +extend_timeout_interval=$((extend_timeout_interval * 1000000)) + +# shellcheck disable=SC2064 +trap "{ touch /${SERVICE}.terminated; exit 1; }" SIGTERM SIGABRT + +rm -f "/${SERVICE}".* +touch "/${SERVICE}.startfail" + +systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +while [[ $start_intervals -gt 0 ]] +do + sleep "$sleep_interval" + start_intervals=$((start_intervals - 1)) + systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +done + +systemd-notify --ready --status="Waiting for your request" + +touch "/${SERVICE}.runtimefail" +rm "/${SERVICE}.startfail" + +systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +while [[ $run_intervals -gt 0 ]] +do + sleep "$sleep_interval" + run_intervals=$((run_intervals - 1)) + systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +done + +systemd-notify STOPPING=1 + +touch "/${SERVICE}.stopfail" +rm "/${SERVICE}.runtimefail" + +systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +while [[ $stop_intervals -gt 0 ]] +do + sleep "$sleep_interval" + stop_intervals=$((stop_intervals - 1)) + systemd-notify EXTEND_TIMEOUT_USEC="$extend_timeout_interval" +done + +touch "/${SERVICE}.success" +rm "/${SERVICE}.stopfail" + +exit 0 diff --git a/test/testsuite-16.units/fail-runtime.service b/test/testsuite-16.units/fail-runtime.service new file mode 100644 index 0000000..1d74963 --- /dev/null +++ b/test/testsuite-16.units/fail-runtime.service @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Fail Runtime (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after RuntimeSecMax.) + +[Service] +# EXTEND_TIMEOUT_USEC on runtime start (0) and 7 seconds after. Systemd will expect one at 7+5 (extend_timeout_interval) +# seconds this won't happen until 7 + 7 (sleep interval) seconds. Therefore timeout at 12 seconds. +Type=notify +TimeoutStartSec=4 +TimeoutStopSec=4 +RuntimeMaxSec=10 +Environment=SERVICE=fail_runtime extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=2 stop_intervals=0 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh diff --git a/test/testsuite-16.units/fail-start.service b/test/testsuite-16.units/fail-start.service new file mode 100644 index 0000000..38aebf2 --- /dev/null +++ b/test/testsuite-16.units/fail-start.service @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Fail Start (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after TimeoutStartSec.) + +[Service] + +# EXTEND_TIMEOUT_USEC on startup and 7 seconds from start. Systemd will expect one at 7+5 (extend_timeout_interval) +# seconds this won't happen until 7 + 7 (sleep interval) seconds. Therefore timeout at 12 seconds. +Type=notify +TimeoutStartSec=10 +TimeoutStopSec=4 +RuntimeMaxSec=4 +Environment=SERVICE=fail_start extend_timeout_interval=5 sleep_interval=7 start_intervals=2 run_intervals=0 stop_intervals=0 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh diff --git a/test/testsuite-16.units/fail-stop.service b/test/testsuite-16.units/fail-stop.service new file mode 100644 index 0000000..1910ac9 --- /dev/null +++ b/test/testsuite-16.units/fail-stop.service @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Fail Stop (EXTEND_TIMEOUT_USEC Didn't occur in sufficient time after TimeoutStopSec.) + +[Service] +# EXTEND_TIMEOUT_USEC on stop (0) and 7 seconds after. Systemd will expect one at 7+5 (extend_timeout_interval) +# seconds this won't happen until 7 + 7 (sleep interval) seconds. Therefore timeout at 12 seconds. +Type=notify +TimeoutStartSec=4 +TimeoutStopSec=10 +RuntimeMaxSec=4 +Environment=SERVICE=fail_stop extend_timeout_interval=5 sleep_interval=7 start_intervals=0 run_intervals=0 stop_intervals=2 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh +# Due to 6041a7ee2c1bbff6301082f192fc1b0882400d42 SIGTERM isn't sent as the service shuts down with STOPPING=1 +# This file makes the test assess.sh quicker by notifing it that this test has finished. +ExecStopPost=/bin/bash -c '[[ $SERVICE_RESULT == timeout && $EXIT_CODE == killed ]] && touch /fail_runtime.terminated' diff --git a/test/testsuite-16.units/success-all.service b/test/testsuite-16.units/success-all.service new file mode 100644 index 0000000..1fdc363 --- /dev/null +++ b/test/testsuite-16.units/success-all.service @@ -0,0 +1,15 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: EXTEND_TIMEOUT_USEC Success - extend timeout on all services + +[Service] + +# Normal success - startup / runtime / shutdown all take 8 seconds which is within the EXTEND_TIMEOUT_USEC=4 seconds interval +# runtime is 8+8+8 seconds. so we are relying on the EXTEND_TIMEOUT_USEC to exceed all stages, Start, Runtime and Stop. +# success occurs after 24 seconds +Type=notify +TimeoutStartSec=4 +TimeoutStopSec=4 +RuntimeMaxSec=4 +Environment=SERVICE=success_all extend_timeout_interval=4 sleep_interval=2 start_intervals=3 run_intervals=3 stop_intervals=3 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh diff --git a/test/testsuite-16.units/success-runtime.service b/test/testsuite-16.units/success-runtime.service new file mode 100644 index 0000000..2f5744d --- /dev/null +++ b/test/testsuite-16.units/success-runtime.service @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Success Runtime (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < RuntimeMaxSec) + +[Service] + +# EXTEND_TIMEOUT_USEC=4 second once during runtime, but sleep for 6 seconds. +# Runtime is 6 seconds and < RuntimeMaxSec so still successful. +Type=notify +TimeoutStartSec=4 +TimeoutStopSec=4 +RuntimeMaxSec=8 +Environment=SERVICE=success_runtime extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=1 stop_intervals=0 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh diff --git a/test/testsuite-16.units/success-start.service b/test/testsuite-16.units/success-start.service new file mode 100644 index 0000000..be518e9 --- /dev/null +++ b/test/testsuite-16.units/success-start.service @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Success Start (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < TimeoutStartSec) + +[Service] +# EXTEND_TIMEOUT_USEC=4 second interval once at startup, but sleep 6 seconds. +# Therefore startup is 6 seconds and < TimeoutStartSec so still successful. +Type=notify +TimeoutStartSec=8 +TimeoutStopSec=4 +RuntimeMaxSec=4 +Environment=SERVICE=success_start extend_timeout_interval=4 sleep_interval=6 start_intervals=1 run_intervals=0 stop_intervals=0 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh diff --git a/test/testsuite-16.units/success-stop.service b/test/testsuite-16.units/success-stop.service new file mode 100644 index 0000000..2bd3e3e --- /dev/null +++ b/test/testsuite-16.units/success-stop.service @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later +[Unit] +Description=Testsuite: Success Stop (EXTEND_TIMEOUT_USEC > WATCHDOG_USEC however < TimeoutStopSec) + +[Service] +# EXTEND_TIMEOUT_USEC=4 seconds once during shutdown, but sleep for 6 seconds. +# Therefore stop time is 6 seconds and < TimeoutStopSec so still successful. +Type=notify +TimeoutStartSec=4 +TimeoutStopSec=8 +RuntimeMaxSec=4 +Environment=SERVICE=success_stop extend_timeout_interval=4 sleep_interval=6 start_intervals=0 run_intervals=0 stop_intervals=1 +ExecStart=/usr/lib/systemd/tests/testdata/testsuite-16.units/extend-timeout.sh -- cgit v1.2.3