shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-10 01:17:44 +03:00
Code

test: make masking of supplementary services configurable

Browse Source
This commit is contained in:
Frantisek Sumsal 2022-02-16 20:29:14 +01:00
parent e83cfbf972
commit 508a7f04b3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/TEST-01-BASIC/test.sh
View File

@ -6,6 +6,7 @@ TEST_DESCRIPTION="Basic systemd setup"
IMAGE_NAME="basic" IMAGE_NAME="basic"
RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes} RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes}
TEST_REQUIRE_INSTALL_TESTS=0 TEST_REQUIRE_INSTALL_TESTS=0
TEST_SUPPORTING_SERVICES_SHOULD_BE_MASKED=0
# shellcheck source=test/test-functions # shellcheck source=test/test-functions
. "${TEST_BASE_DIR:?}/test-functions" . "${TEST_BASE_DIR:?}/test-functions"

6
test/test-functions
View File

@ -40,6 +40,7 @@ IMAGE_NAME=${IMAGE_NAME:-default}
STRIP_BINARIES="${STRIP_BINARIES:-yes}" STRIP_BINARIES="${STRIP_BINARIES:-yes}"
TEST_REQUIRE_INSTALL_TESTS="${TEST_REQUIRE_INSTALL_TESTS:-1}" TEST_REQUIRE_INSTALL_TESTS="${TEST_REQUIRE_INSTALL_TESTS:-1}"
TEST_PARALLELIZE="${TEST_PARALLELIZE:-0}" TEST_PARALLELIZE="${TEST_PARALLELIZE:-0}"
TEST_SUPPORTING_SERVICES_SHOULD_BE_MASKED="${TEST_SUPPORTING_SERVICES_SHOULD_BE_MASKED:-1}"
LOOPDEV= LOOPDEV=
# Simple wrapper to unify boolean checks. # Simple wrapper to unify boolean checks.
@ -2934,9 +2935,8 @@ test_setup() {
fi fi
mount_initdir mount_initdir
# We want to test all services in TEST-01-BASIC, but mask them in
# all other tests if get_bool "${TEST_SUPPORTING_SERVICES_SHOULD_BE_MASKED}"; then
if [[ "${TESTID:?}" != "01" ]]; then
dinfo "Masking supporting services" dinfo "Masking supporting services"
mask_supporting_services mask_supporting_services
fi fi