test: rename assert.sh to util.sh

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

No functional change.

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/
 

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

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.
 

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.
 

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
 

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 /

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?}

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

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
 

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

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

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

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

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
 

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

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

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

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:

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

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

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"
 

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
 

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
 

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
 

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
 

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
 

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
 

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