test: rename assert.sh to util.sh

So we can extend it with additional utility functions without making it
confusing.

No functional change.

diff --git a/test/units/assert.sh b/test/units/assert.sh
deleted file mode 100755 (executable)
index 2f4d93a..0000000
--- a/test/units/assert.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-# SPDX-License-Identifier: LGPL-2.1-or-later
-
-# utility functions for shell tests
-
-assert_true() {(
-    set +ex
-
-    local rc
-
-    "$@"
-    rc=$?
-    if [[ $rc -ne 0 ]]; then
-        echo "FAIL: command '$*' failed with exit code $rc" >&2
-        exit 1
-    fi
-)}
-
-
-assert_eq() {(
-    set +ex
-
-    if [[ "${1?}" != "${2?}" ]]; then
-        echo "FAIL: expected: '$2' actual: '$1'" >&2
-        exit 1
-    fi
-)}
-
-assert_in() {(
-    set +ex
-
-    if ! [[ "${2?}" =~ ${1?} ]]; then
-        echo "FAIL: '$1' not found in:" >&2
-        echo "$2" >&2
-        exit 1
-    fi
-)}
-
-assert_not_in() {(
-    set +ex
-
-    if [[ "${2?}" =~ ${1?} ]]; then
-        echo "FAIL: '$1' found in:" >&2
-        echo "$2" >&2
-        exit 1
-    fi
-)}
-
-assert_rc() {(
-    set +ex
-
-    local rc exp="${1?}"
-
-    shift
-    "$@"
-    rc=$?
-    assert_eq "$rc" "$exp"
-)}

diff --git a/test/units/testsuite-17.02.sh b/test/units/testsuite-17.02.sh
index 82f9fd1f629ed643505c4f0b28cc04d2a8263218..22b1552653d0b97e05ca9844cf7e682771059eb8 100755 (executable)
--- a/test/units/testsuite-17.02.sh
+++ b/test/units/testsuite-17.02.sh
@@ -7,8 +7,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 mkdir -p /run/udev/rules.d/
 

diff --git a/test/units/testsuite-17.07.sh b/test/units/testsuite-17.07.sh
index b4dfd904e9982967f504d2cea534b6ed5d17a930..629393a56dea36c6a6a869d48ca2cbcb67683828 100755 (executable)
--- a/test/units/testsuite-17.07.sh
+++ b/test/units/testsuite-17.07.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 wait_service_active() {(
     set +ex

diff --git a/test/units/testsuite-17.08.sh b/test/units/testsuite-17.08.sh
index a49a77dc44810e31d47ca735f8c5b92a73b241d8..e570c69e9fdf1c722a76d54ed324d18621151036 100755 (executable)
--- a/test/units/testsuite-17.08.sh
+++ b/test/units/testsuite-17.08.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 # This is a test for issue #24518.
 

diff --git a/test/units/testsuite-17.09.sh b/test/units/testsuite-17.09.sh
index 31fc9d684233b889d17744ab15bb3f7e07a4553b..99931962d5baf1327b089de188a94787f6f46ffd 100755 (executable)
--- a/test/units/testsuite-17.09.sh
+++ b/test/units/testsuite-17.09.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 # This is a test for issue #24987.
 

diff --git a/test/units/testsuite-17.10.sh b/test/units/testsuite-17.10.sh
index 073e3762ff11a9d9c60b53933e9955b652c9ab82..a58112682eaf9376475199d85ec6997dfdff5cc3 100755 (executable)
--- a/test/units/testsuite-17.10.sh
+++ b/test/units/testsuite-17.10.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 # Coverage test for udevadm
 

diff --git a/test/units/testsuite-17.11.sh b/test/units/testsuite-17.11.sh
index ce6f58077f2be73d738c8532299f0040f729d571..f2b5ab96ff425ea9883ef74b94ddf8b36f22c7f1 100755 (executable)
--- a/test/units/testsuite-17.11.sh
+++ b/test/units/testsuite-17.11.sh
@@ -5,8 +5,8 @@ set -o pipefail
 
 # Test for udevadm verify.
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 cleanup() {
     cd /

diff --git a/test/units/testsuite-17.12.sh b/test/units/testsuite-17.12.sh
index df74d356eeef11df913bbfef433145eef1df2cdc..ccc91bfe460f151bbef684599767c9f92f4169d5 100755 (executable)
--- a/test/units/testsuite-17.12.sh
+++ b/test/units/testsuite-17.12.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 create_link_file() {
     name=${1?}

diff --git a/test/units/testsuite-22.16.sh b/test/units/testsuite-22.16.sh
index 15387cddb828d35800d5c6754ae376b9e03dfd16..555e07fec7532243af332eb1dfd92b639fc59781 100755 (executable)
--- a/test/units/testsuite-22.16.sh
+++ b/test/units/testsuite-22.16.sh
@@ -5,8 +5,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 rm -f /tmp/acl_exec
 touch /tmp/acl_exec

diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh
index dc8e1e47c69d1de73f22a22e9ac5773a945e4b47..45d044be667ce0a4f8555e9cfdf52b612f74040c 100755 (executable)
--- a/test/units/testsuite-26.sh
+++ b/test/units/testsuite-26.sh
@@ -4,8 +4,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 : >/failed
 

diff --git a/test/units/testsuite-35.sh b/test/units/testsuite-35.sh
index 76127102c41899b948964649f5af91194a235706..2c6a384299acd7ba902ce53deb4e277116c9fe38 100755 (executable)
--- a/test/units/testsuite-35.sh
+++ b/test/units/testsuite-35.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 cleanup_test_user() (
     set +ex

diff --git a/test/units/testsuite-45.sh b/test/units/testsuite-45.sh
index 74b3a2c6a97f17edfee92263f932bb8484deb771..b21b1105d7010fdd3652ef2179e4cf701e55670f 100755 (executable)
--- a/test/units/testsuite-45.sh
+++ b/test/units/testsuite-45.sh
@@ -4,8 +4,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 test_timedatectl() {
     timedatectl --no-pager --help

diff --git a/test/units/testsuite-58.sh b/test/units/testsuite-58.sh
index 6cc699f15177e5b3118382d4149a5c36ff6881aa..86c56a24f88ff7f9a96cc20ad4445641db8d4736 100755 (executable)
--- a/test/units/testsuite-58.sh
+++ b/test/units/testsuite-58.sh
@@ -14,8 +14,8 @@ if ! command -v systemd-repart &>/dev/null; then
     exit 0
 fi
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 export SYSTEMD_LOG_LEVEL=debug
 export PAGER=cat

diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh
index 5795d6bbeb72287658070a91a9f9a8e39c091f08..f51d3fdef95e764c5751e8c233cf43cbca754dce 100755 (executable)
--- a/test/units/testsuite-60.sh
+++ b/test/units/testsuite-60.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 teardown_test_dependencies() (
     set +eux

diff --git a/test/units/testsuite-63.sh b/test/units/testsuite-63.sh
index 59a7b3208fc7aa84f813184068916ec2a6716448..0be1f86d9cfeffa9d725e8a9f52357c5e17586c3 100755 (executable)
--- a/test/units/testsuite-63.sh
+++ b/test/units/testsuite-63.sh
@@ -3,8 +3,8 @@
 set -ex
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 systemctl log-level debug
 

diff --git a/test/units/testsuite-65.sh b/test/units/testsuite-65.sh
index 2ad7b9a4394983dc1b2a47f74361928f9a4565d1..05673e7cc73f43f986a360a4017dbb2ba56cc9d0 100755 (executable)
--- a/test/units/testsuite-65.sh
+++ b/test/units/testsuite-65.sh
@@ -3,8 +3,8 @@
 # shellcheck disable=SC2016
 set -eux
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 systemctl log-level debug
 export SYSTEMD_LOG_LEVEL=debug

diff --git a/test/units/testsuite-71.sh b/test/units/testsuite-71.sh
index d9663de158a641b8672f6694352e1ed061352bcc..fca1819b7446d7cd1f2440d73eac46fd35030a69 100755 (executable)
--- a/test/units/testsuite-71.sh
+++ b/test/units/testsuite-71.sh
@@ -4,8 +4,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 restore_hostname() {
     if [[ -e /tmp/hostname.bak ]]; then

diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh
index 8f33baf8794e469c32e1d82ffee89290449dd90d..39992a844b9b1dc2c4ee8e529a9d1a0679e3466d 100755 (executable)
--- a/test/units/testsuite-73.sh
+++ b/test/units/testsuite-73.sh
@@ -4,8 +4,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 enable_debug() {
     mkdir -p /run/systemd/system/systemd-localed.service.d

diff --git a/test/units/testsuite-74.escape.sh b/test/units/testsuite-74.escape.sh
index 8e6896cccfe18b9d2602e059a454ae51582a1a11..584c7340b5f81109f3fc15068227ef747124f0e7 100755 (executable)
--- a/test/units/testsuite-74.escape.sh
+++ b/test/units/testsuite-74.escape.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 # Simple wrapper to check both escaping and unescaping of given strings
 # Arguments:

diff --git a/test/units/testsuite-74.id128.sh b/test/units/testsuite-74.id128.sh
index 6a9d2135c037ae7cbcacc3f230fc6d55e8a99819..213333d9d1fe98e931c6e6fbd1d8583ecda56fb5 100755 (executable)
--- a/test/units/testsuite-74.id128.sh
+++ b/test/units/testsuite-74.id128.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 systemd-id128 --help
 systemd-id128 help

diff --git a/test/units/testsuite-74.mount.sh b/test/units/testsuite-74.mount.sh
index bfe472bef7a82d047743b495c4d989b9fcc196b4..c4ecfdcadad5195a2d92b7f3db72a2e2d8ad47d4 100755 (executable)
--- a/test/units/testsuite-74.mount.sh
+++ b/test/units/testsuite-74.mount.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 # We're going to play around with block/loop devices, so bail out early
 # if we're running in nspawn

diff --git a/test/units/testsuite-74.path.sh b/test/units/testsuite-74.path.sh
index 08ac9ca82c19da3a82ef77744fb01897b79525b8..79056a5b2bb3df6b660b3e8e2c4035908f076083 100755 (executable)
--- a/test/units/testsuite-74.path.sh
+++ b/test/units/testsuite-74.path.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 USER_DIRS_CONF="/root/.config/user-dirs.dirs"
 

diff --git a/test/units/testsuite-75.sh b/test/units/testsuite-75.sh
index c5487555b6433a75166595e3195cb87aa2603f35..24af11b5895054e3d1257d946c10a2a576c69480 100755 (executable)
--- a/test/units/testsuite-75.sh
+++ b/test/units/testsuite-75.sh
@@ -11,8 +11,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 : >/failed
 

diff --git a/test/units/testsuite-76.sh b/test/units/testsuite-76.sh
index ef1eedf68b925736d14ef31732439fbce29b7230..855d0ef1f848273bbdd7d36bc2a2b4fae83a407d 100755 (executable)
--- a/test/units/testsuite-76.sh
+++ b/test/units/testsuite-76.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 export SYSTEMD_LOG_LEVEL=debug
 

diff --git a/test/units/testsuite-77-client.sh b/test/units/testsuite-77-client.sh
index 0f88a6d835cf92de8fea70b4066589849b5473f0..0d9487ab964a1e4cbb120b47eb991fd37bc34c33 100755 (executable)
--- a/test/units/testsuite-77-client.sh
+++ b/test/units/testsuite-77-client.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 export SYSTEMD_LOG_LEVEL=debug
 

diff --git a/test/units/testsuite-77-run.sh b/test/units/testsuite-77-run.sh
index 086044a2bc286eea439640cc6e69e7ed4b0b1c78..fadd34d517d4ec7d36dff5de0919f5b381cf46ba 100755 (executable)
--- a/test/units/testsuite-77-run.sh
+++ b/test/units/testsuite-77-run.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 export SYSTEMD_LOG_LEVEL=debug
 

diff --git a/test/units/testsuite-77.sh b/test/units/testsuite-77.sh
index 61749fd0c8be0da9687cfebd42127b2ba3f6196f..2b85a8c5650eb033d0d3cd3c9abc4afca8635acf 100755 (executable)
--- a/test/units/testsuite-77.sh
+++ b/test/units/testsuite-77.sh
@@ -3,8 +3,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 export SYSTEMD_LOG_LEVEL=debug
 

diff --git a/test/units/testsuite-80.sh b/test/units/testsuite-80.sh
index 7440b241bee9f51f16861a3c7bb94881c6e3f8e7..592af9a1322dc135876b9e39f6c461aa685982cf 100755 (executable)
--- a/test/units/testsuite-80.sh
+++ b/test/units/testsuite-80.sh
@@ -4,8 +4,8 @@
 set -eux
 set -o pipefail
 
-# shellcheck source=test/units/assert.sh
-. "$(dirname "$0")"/assert.sh
+# shellcheck source=test/units/util.sh
+. "$(dirname "$0")"/util.sh
 
 : >/failed
 

diff --git a/test/units/util.sh b/test/units/util.sh
new file mode 100755 (executable)
index 0000000..00b8c5e
--- /dev/null
+++ b/test/units/util.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env bash
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+# Utility functions for shell tests
+
+assert_true() {(
+    set +ex
+
+    local rc
+
+    "$@"
+    rc=$?
+    if [[ $rc -ne 0 ]]; then
+        echo "FAIL: command '$*' failed with exit code $rc" >&2
+        exit 1
+    fi
+)}
+
+
+assert_eq() {(
+    set +ex
+
+    if [[ "${1?}" != "${2?}" ]]; then
+        echo "FAIL: expected: '$2' actual: '$1'" >&2
+        exit 1
+    fi
+)}
+
+assert_in() {(
+    set +ex
+
+    if ! [[ "${2?}" =~ ${1?} ]]; then
+        echo "FAIL: '$1' not found in:" >&2
+        echo "$2" >&2
+        exit 1
+    fi
+)}
+
+assert_not_in() {(
+    set +ex
+
+    if [[ "${2?}" =~ ${1?} ]]; then
+        echo "FAIL: '$1' found in:" >&2
+        echo "$2" >&2
+        exit 1
+    fi
+)}
+
+assert_rc() {(
+    set +ex
+
+    local rc exp="${1?}"
+
+    shift
+    "$@"
+    rc=$?
+    assert_eq "$rc" "$exp"
+)}