SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: de-duplicate test_setup() functions

Browse Source 
Now we will run setup_nspawn_root() in some case where do don't need to.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2020-03-28 11:51:11 +01:00
parent bdfa9657d0
commit 70ce817ccb
37 changed files with 19 additions and 486 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/TEST-03-JOBS/test.sh
-14
View File
@@ -5,18 +5,4 @@ TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 03
test/TEST-04-JOURNAL/test.sh
-14
View File
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="Journal-related tests"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 04
test/TEST-05-RLIMITS/test.sh
-14
View File
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="Resource limits-related tests"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 05
test/TEST-07-ISSUE-1981/test.sh
-14
View File
@@ -7,18 +7,4 @@ TEST_NO_QEMU=1
NSPAWN_TIMEOUT=30
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 07
test/TEST-09-ISSUE-2691/test.sh
-13
View File
@@ -6,17 +6,4 @@ TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
QEMU_TIMEOUT=300
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 09
test/TEST-10-ISSUE-2467/test.sh
-14
View File
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/2467"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 10
test/TEST-11-ISSUE-3166/test.sh
-13
View File
@@ -5,17 +5,4 @@ TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 11
test/TEST-12-ISSUE-3171/test.sh
-15
View File
@@ -5,19 +5,4 @@ TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 12
test/TEST-15-DROPIN/test.sh
-9
View File
@@ -5,13 +5,4 @@ TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
# create the basic filesystem layout
setup_basic_environment
mask_supporting_services
# create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
setup_nspawn_root
}
do_test "$@" 15
test/TEST-16-EXTEND-TIMEOUT/test.sh
-14
View File
@@ -6,18 +6,4 @@ TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image
# Create what will eventually be our root filesystem onto an overlay
(
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 16
test/TEST-17-UDEV-WANTS/test.sh
-12
View File
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
QEMU_TIMEOUT=300
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 17
test/TEST-18-FAILUREACTION/test.sh
-14
View File
@@ -5,18 +5,4 @@ TEST_DESCRIPTION="FailureAction= operation"
. $TEST_BASE_DIR/test-functions
QEMU_TIMEOUT=600
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 18
test/TEST-19-DELEGATE/test.sh
-12
View File
@@ -7,16 +7,4 @@ TEST_NO_NSPAWN=1
QEMU_TIMEOUT=600
UNIFIED_CGROUP_HIERARCHY=yes
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 19
test/TEST-20-MAINPIDGAMES/test.sh
-14
View File
@@ -4,18 +4,4 @@ TEST_DESCRIPTION="test changing main PID"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 20
test/TEST-22-TMPFILES/test.sh
-10
View File
@@ -2,16 +2,6 @@
set -e
TEST_DESCRIPTION="Tmpfiles related tests"
TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
# create the basic filesystem layout
setup_basic_environment
mask_supporting_services
# create dedicated rootfs for nspawn (located in $TESTDIR/nspawn-root)
setup_nspawn_root
}
do_test "$@" 22
test/TEST-23-TYPE-EXEC/test.sh
-14
View File
@@ -1,20 +1,6 @@
#!/usr/bin/env bash
set -e
TEST_DESCRIPTION="test Type=exec"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 23
test/TEST-24-UNIT-TESTS/test.sh
-19
View File
@@ -52,23 +52,4 @@ check_result_qemu() {
return $_ret
}
test_setup() {
if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
dfatal "Needs to be built with -Dinstall-tests=true"
exit 1
fi
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 24
test/TEST-25-IMPORT/test.sh
-13
View File
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test importd"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 25
test/TEST-26-SETENV/test.sh
-13
View File
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test setenv"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 26
test/TEST-27-STDOUTFILE/test.sh
-13
View File
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test StandardOutput=file:"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 27
test/TEST-28-PERCENTJ-WANTEDBY/test.sh
-14
View File
@@ -5,18 +5,4 @@ RUN_IN_UNPRIVILEGED_CONTAINER=yes
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 28
test/TEST-29-UDEV-ID_RENAMING/test.sh
-12
View File
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
QEMU_TIMEOUT=300
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 29
test/TEST-30-ONCLOCKCHANGE/test.sh
-13
View File
@@ -2,19 +2,6 @@
set -e
TEST_DESCRIPTION="test OnClockChange= + OnTimezoneChange="
TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 30
test/TEST-31-DEVICE-ENUMERATION/test.sh
-12
View File
@@ -6,16 +6,4 @@ TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
QEMU_TIMEOUT=300
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 31
test/TEST-32-OOMPOLICY/test.sh
-13
View File
@@ -2,21 +2,8 @@
set -e
TEST_DESCRIPTION="test OOM killer logic"
TEST_NO_NSPAWN=1
. $TEST_BASE_DIR/test-functions
UNIFIED_CGROUP_HIERARCHY=yes
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 32
test/TEST-33-CLEAN-UNIT/test.sh
-14
View File
@@ -3,20 +3,6 @@
# ex: ts=8 sw=4 sts=4 et filetype=sh
set -e
TEST_DESCRIPTION="test CleanUnit"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 33
test/TEST-34-DYNAMICUSERMIGRATE/test.sh
-14
View File
@@ -1,20 +1,6 @@
#!/usr/bin/env bash
set -e
TEST_DESCRIPTION="test migrating state directory from DynamicUser=1 to DynamicUser=0 and back"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 34
test/TEST-36-NUMAPOLICY/test.sh
-13
View File
@@ -4,19 +4,6 @@ set -e
TEST_DESCRIPTION="test MUMAPolicy= and NUMAMask= options"
TEST_NO_NSPAWN=1
QEMU_OPTIONS="-numa node,nodeid=0"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
}
do_test "$@" 36
test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh
-14
View File
@@ -3,20 +3,6 @@
# ex: ts=8 sw=4 sts=4 et filetype=sh
set -e
TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 37
test/TEST-39-EXECRELOAD/test.sh
-15
View File
@@ -1,21 +1,6 @@
#!/usr/bin/env bash
set -e
TEST_DESCRIPTION="Test ExecReload= (PR #13098)"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 39
test/TEST-40-EXEC-COMMAND-EX/test.sh
-14
View File
@@ -1,20 +1,6 @@
#!/usr/bin/env bash
set -e
TEST_DESCRIPTION="test ExecXYZEx= service unit dbus hookups"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 40
test/TEST-41-ONESHOT-RESTART/test.sh
-13
View File
@@ -3,17 +3,4 @@ set -e
TEST_DESCRIPTION="Test oneshot unit restart on failure"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 41
test/TEST-42-EXECSTOPPOST/test.sh
-13
View File
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test that ExecStopPost= is always run"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 42
test/TEST-43-PRIVATEUSER-UNPRIV/test.sh
-13
View File
@@ -3,19 +3,6 @@ set -e
TEST_DESCRIPTION="Test PrivateUsers=yes on user manager"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
has_user_dbus_socket || exit 0
do_test "$@" 43
test/TEST-44-LOG-NAMESPACE/test.sh
-13
View File
@@ -4,17 +4,4 @@ TEST_DESCRIPTION="test log namespaces"
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image_rootdir
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
do_test "$@" 44
test/TEST-46-HOMED/test.sh
-18
View File
@@ -5,22 +5,4 @@ TEST_NO_QEMU=1
. $TEST_BASE_DIR/test-functions
test_setup() {
create_empty_image
mkdir -p $TESTDIR/root
mount ${LOOPDEV}p1 $TESTDIR/root
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
) || return 1
setup_nspawn_root
ddebug "umount $TESTDIR/root"
umount $TESTDIR/root
}
do_test "$@" 46
test/test-functions
+19
View File
@@ -1893,6 +1893,25 @@ test_cleanup() {
_test_cleanup
}
test_setup() {
if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then
dfatal "Needs to be built with -Dinstall-tests=true"
exit 1
fi
create_empty_image_rootdir
# Create what will eventually be our root filesystem onto an overlay
(
LOG_LEVEL=5
eval $(udevadm info --export --query=env --name=${LOOPDEV}p2)
setup_basic_environment
mask_supporting_services
)
setup_nspawn_root
}
test_run() {
if [ -z "$TEST_NO_QEMU" ]; then
if run_qemu "$1"; then