test: rename TEST-53-ISSUE-16347 to TEST-53-TIMER

And split the existing test into a separate subtest.

(cherry picked from commit 953c347fb6f293acbd6da009646bfc071b68ddd7)

diff --git a/test/integration-tests/TEST-53-ISSUE-16347/meson.build b/test/integration-tests/TEST-53-TIMER/meson.build
similarity index 100%
rename from test/integration-tests/TEST-53-ISSUE-16347/meson.build
rename to test/integration-tests/TEST-53-TIMER/meson.build

diff --git a/test/integration-tests/meson.build b/test/integration-tests/meson.build
index f28be9e24ea71cd82decb8ff0aeb350dfa1cd6ed..5965f6646cbae49f80f5be36dadacd61e9039935 100644 (file)
--- a/test/integration-tests/meson.build
+++ b/test/integration-tests/meson.build
@@ -70,7 +70,7 @@ foreach dirname : [
         'TEST-46-HOMED',
         'TEST-50-DISSECT',
         'TEST-52-HONORFIRSTSHUTDOWN',
-        'TEST-53-ISSUE-16347',
+        'TEST-53-TIMER',
         'TEST-54-CREDS',
         'TEST-55-OOMD',
         'TEST-58-REPART',

diff --git a/test/units/TEST-53-ISSUE-16347.sh b/test/units/TEST-53-TIMER.issue-16347.sh
similarity index 82%
rename from test/units/TEST-53-ISSUE-16347.sh
rename to test/units/TEST-53-TIMER.issue-16347.sh
index 84cd66129d007e40c166bf8b772e26161a5a7b14..8b266145cd0df6031e96f80b57fa32fb4c40727e 100755 (executable)
--- a/test/units/TEST-53-ISSUE-16347.sh
+++ b/test/units/TEST-53-TIMER.issue-16347.sh
@@ -3,10 +3,9 @@
 set -eux
 set -o pipefail
 
-: >/failed
-
 # Reset host date to current time, 3 days in the past.
 date -s "-3 days"
+trap 'date -s "+3 days"' EXIT
 
 # Run a timer for every 15 minutes.
 systemd-run --unit test-timer --on-calendar "*:0/15:0" true
@@ -17,15 +16,12 @@ now=$(date +%s)
 time_delta=$((next_elapsed - now))
 
 # Check that the timer will elapse in less than 20 minutes.
-((0 < time_delta && time_delta < 1200)) || {
+if [[ "$time_delta" -lt 0 || "$time_delta" -gt 1200 ]]; then
     echo 'Timer elapse outside of the expected 20 minute window.'
     echo "  next_elapsed=${next_elapsed}"
     echo "  now=${now}"
     echo "  time_delta=${time_delta}"
-    echo ''
-} >>/failed
+    echo
 
-if test ! -s /failed ; then
-    rm -f /failed
-    touch /testok
+    exit 1
 fi

diff --git a/test/units/TEST-53-TIMER.sh b/test/units/TEST-53-TIMER.sh
new file mode 100755 (executable)
index 0000000..9c2a033
--- /dev/null
+++ b/test/units/TEST-53-TIMER.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+set -eux
+set -o pipefail
+
+# shellcheck source=test/units/test-control.sh
+. "$(dirname "$0")"/test-control.sh
+
+run_subtests
+
+touch /testok