diff --git a/test/units/testsuite-15.sh b/test/units/testsuite-15.sh index 204fa99219..7143a1597a 100755 --- a/test/units/testsuite-15.sh +++ b/test/units/testsuite-15.sh @@ -8,10 +8,6 @@ set -o pipefail # shellcheck source=test/units/util.sh . "$(dirname "$0")"/util.sh -# Needed to write units to /usr/lib/systemd/system to test /etc and /run overrides. -maybe_mount_usr_overlay -trap 'maybe_umount_usr_overlay' EXIT - clear_unit() { local unit_name="${1:?}" local base suffix diff --git a/test/units/testsuite-26.sh b/test/units/testsuite-26.sh index 27aa98edb7..61b0ffd812 100755 --- a/test/units/testsuite-26.sh +++ b/test/units/testsuite-26.sh @@ -12,16 +12,10 @@ at_exit() { rm -fvr "/usr/lib/systemd/system/$UNIT_NAME" "/etc/systemd/system/$UNIT_NAME.d" "+4" fi - maybe_umount_usr_overlay - rm -f /etc/init.d/issue-24990 return 0 } -# Needed for /usr/lib/systemd/system/$UNIT_NAME to test overrides in /etc and /run -maybe_mount_usr_overlay -trap at_exit EXIT - # Create a simple unit file for testing # Note: the service file is created under /usr on purpose to test # the 'revert' verb as well diff --git a/test/units/testsuite-60.sh b/test/units/testsuite-60.sh index c777de8526..e800a7a12c 100755 --- a/test/units/testsuite-60.sh +++ b/test/units/testsuite-60.sh @@ -6,10 +6,6 @@ set -o pipefail # shellcheck source=test/units/util.sh . "$(dirname "$0")"/util.sh -# Needed to create mount.mytmpfs helper -maybe_mount_usr_overlay -trap 'maybe_umount_usr_overlay' EXIT - teardown_test_dependencies() ( set +eux diff --git a/test/units/testsuite-73.sh b/test/units/testsuite-73.sh index 59f84f20ab..df5af4ba87 100755 --- a/test/units/testsuite-73.sh +++ b/test/units/testsuite-73.sh @@ -9,10 +9,6 @@ set -o pipefail # shellcheck source=test/units/util.sh . "$(dirname "$0")"/util.sh -# Needed to generate test locales in /usr/lib -maybe_mount_usr_overlay -trap 'maybe_umount_usr_overlay' EXIT - enable_debug() { mkdir -p /run/systemd/system/systemd-localed.service.d cat >>/run/systemd/system/systemd-localed.service.d/override.conf <