test: rename assert.sh to util.sh

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

No functional change.

28 files changed, 55 insertions, 55 deletions

diff --git a/test/units/testsuite-17.02.sh b/test/units/testsuite-17.02.sh
index 82f9fd1f62..22b1552653 100755
--- 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 b4dfd904e9..629393a56d 100755
--- 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 a49a77dc44..e570c69e9f 100755
--- 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 31fc9d6842..99931962d5 100755
--- 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 073e3762ff..a58112682e 100755
--- 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 ce6f58077f..f2b5ab96ff 100755
--- 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 df74d356ee..ccc91bfe46 100755
--- 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 15387cddb8..555e07fec7 100755
--- 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 dc8e1e47c6..45d044be66 100755
--- 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 76127102c4..2c6a384299 100755
--- 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 74b3a2c6a9..b21b1105d7 100755
--- 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 6cc699f151..86c56a24f8 100755
--- 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 5795d6bbeb..f51d3fdef9 100755
--- 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 59a7b3208f..0be1f86d9c 100755
--- 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 2ad7b9a439..05673e7cc7 100755
--- 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 d9663de158..fca1819b74 100755
--- 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 8f33baf879..39992a844b 100755
--- 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 8e6896cccf..584c7340b5 100755
--- 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 6a9d2135c0..213333d9d1 100755
--- 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 bfe472bef7..c4ecfdcada 100755
--- 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 08ac9ca82c..79056a5b2b 100755
--- 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 c5487555b6..24af11b589 100755
--- 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 ef1eedf68b..855d0ef1f8 100755
--- 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 0f88a6d835..0d9487ab96 100755
--- 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 086044a2bc..fadd34d517 100755
--- 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 61749fd0c8..2b85a8c565 100755
--- 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 7440b241be..592af9a132 100755
--- 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/assert.sh b/test/units/util.sh
index 2f4d93ab8c..00b8c5e393 100755
--- a/test/units/assert.sh
+++ b/test/units/util.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
-# utility functions for shell tests
+# Utility functions for shell tests
 
 assert_true() {(
     set +ex