shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-05-29 01:05:59 +03:00
Code

test: rename assert.sh to util.sh

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

No functional change.
This commit is contained in:
Frantisek Sumsal 2023-05-16 19:09:13 +02:00
parent 1fd24da616
commit cb153b4fe9
28 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/units/testsuite-17.02.sh
View File

@ -7,8 +7,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
mkdir -p /run/udev/rules.d/ mkdir -p /run/udev/rules.d/

4
test/units/testsuite-17.07.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
wait_service_active() {( wait_service_active() {(
set +ex set +ex

4
test/units/testsuite-17.08.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
# This is a test for issue #24518. # This is a test for issue #24518.

4
test/units/testsuite-17.09.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
# This is a test for issue #24987. # This is a test for issue #24987.

4
test/units/testsuite-17.10.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
# Coverage test for udevadm # Coverage test for udevadm

4
test/units/testsuite-17.11.sh
View File

@ -5,8 +5,8 @@ set -o pipefail
# Test for udevadm verify. # Test for udevadm verify.
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
cleanup() { cleanup() {
cd / cd /

4
test/units/testsuite-17.12.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
create_link_file() { create_link_file() {
name=${1?} name=${1?}

4
test/units/testsuite-22.16.sh
View File

@ -5,8 +5,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
rm -f /tmp/acl_exec rm -f /tmp/acl_exec
touch /tmp/acl_exec touch /tmp/acl_exec

4
test/units/testsuite-26.sh
View File

@ -4,8 +4,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
: >/failed : >/failed

4
test/units/testsuite-35.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
cleanup_test_user() ( cleanup_test_user() (
set +ex set +ex

4
test/units/testsuite-45.sh
View File

@ -4,8 +4,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
test_timedatectl() { test_timedatectl() {
timedatectl --no-pager --help timedatectl --no-pager --help

4
test/units/testsuite-58.sh
View File

@ -14,8 +14,8 @@ if ! command -v systemd-repart &>/dev/null; then
exit 0 exit 0
fi fi
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug
export PAGER=cat export PAGER=cat

4
test/units/testsuite-60.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
teardown_test_dependencies() ( teardown_test_dependencies() (
set +eux set +eux

4
test/units/testsuite-63.sh
View File

@ -3,8 +3,8 @@
set -ex set -ex
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
systemctl log-level debug systemctl log-level debug

4
test/units/testsuite-65.sh
View File

@ -3,8 +3,8 @@
# shellcheck disable=SC2016 # shellcheck disable=SC2016
set -eux set -eux
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
systemctl log-level debug systemctl log-level debug
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug

4
test/units/testsuite-71.sh
View File

@ -4,8 +4,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
restore_hostname() { restore_hostname() {
if [[ -e /tmp/hostname.bak ]]; then if [[ -e /tmp/hostname.bak ]]; then

4
test/units/testsuite-73.sh
View File

@ -4,8 +4,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
enable_debug() { enable_debug() {
mkdir -p /run/systemd/system/systemd-localed.service.d mkdir -p /run/systemd/system/systemd-localed.service.d

4
test/units/testsuite-74.escape.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
# Simple wrapper to check both escaping and unescaping of given strings # Simple wrapper to check both escaping and unescaping of given strings
# Arguments: # Arguments:

4
test/units/testsuite-74.id128.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
systemd-id128 --help systemd-id128 --help
systemd-id128 help systemd-id128 help

4
test/units/testsuite-74.mount.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
# We're going to play around with block/loop devices, so bail out early # We're going to play around with block/loop devices, so bail out early
# if we're running in nspawn # if we're running in nspawn

4
test/units/testsuite-74.path.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
USER_DIRS_CONF="/root/.config/user-dirs.dirs" USER_DIRS_CONF="/root/.config/user-dirs.dirs"

4
test/units/testsuite-75.sh
View File

@ -11,8 +11,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
: >/failed : >/failed

4
test/units/testsuite-76.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug

4
test/units/testsuite-77-client.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug

4
test/units/testsuite-77-run.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug

4
test/units/testsuite-77.sh
View File

@ -3,8 +3,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
export SYSTEMD_LOG_LEVEL=debug export SYSTEMD_LOG_LEVEL=debug

4
test/units/testsuite-80.sh
View File

@ -4,8 +4,8 @@
set -eux set -eux
set -o pipefail set -o pipefail
# shellcheck source=test/units/assert.sh # shellcheck source=test/units/util.sh
. "$(dirname "$0")"/assert.sh . "$(dirname "$0")"/util.sh
: >/failed : >/failed

2
test/units/assert.sh → test/units/util.sh
View File

@ -1,7 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# SPDX-License-Identifier: LGPL-2.1-or-later # SPDX-License-Identifier: LGPL-2.1-or-later
# utility functions for shell tests # Utility functions for shell tests
assert_true() {( assert_true() {(
set +ex set +ex