diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-11-05 23:14:42 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-05 23:14:42 +0300 |
commit | 8912a99cea2c05b66ba78809eef199d04c6b862e (patch) | |
tree | b406ebafe69e423f83abf2602d51c124dd3ada88 /test | |
parent | a54e373163b79574a8799f6350cb3a4c318c57ee (diff) | |
parent | ed94652a337eeb63eb05c8fb3e2ea6cb854cda19 (diff) | |
download | systemd-8912a99cea2c05b66ba78809eef199d04c6b862e.tar.gz |
Merge pull request #10606 from yuwata/udev-tests
test: mask hwdb-update.services in most tests
Diffstat (limited to 'test')
-rwxr-xr-x | test/TEST-02-CRYPTSETUP/test.sh | 8 | ||||
-rwxr-xr-x | test/TEST-03-JOBS/test.sh | 8 | ||||
-rwxr-xr-x | test/TEST-04-JOURNAL/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-05-RLIMITS/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-06-SELINUX/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-07-ISSUE-1981/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-08-ISSUE-2730/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-09-ISSUE-2691/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-10-ISSUE-2467/test.sh | 1 | ||||
-rwxr-xr-x | test/TEST-11-ISSUE-3166/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-12-ISSUE-3171/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-13-NSPAWN-SMOKE/test.sh | 9 | ||||
-rwxr-xr-x | test/TEST-14-MACHINE-ID/test.sh | 1 | ||||
-rw-r--r-- | test/TEST-15-DROPIN/testsuite.service | 1 | ||||
-rwxr-xr-x | test/TEST-17-UDEV-WANTS/test.sh | 2 | ||||
-rwxr-xr-x | test/TEST-18-FAILUREACTION/test.sh | 7 | ||||
-rwxr-xr-x | test/TEST-19-DELEGATE/test.sh | 8 | ||||
-rwxr-xr-x | test/TEST-20-MAINPIDGAMES/test.sh | 8 | ||||
-rw-r--r-- | test/TEST-22-TMPFILES/testsuite.service | 2 | ||||
-rwxr-xr-x | test/TEST-23-TYPE-EXEC/test.sh | 8 |
20 files changed, 97 insertions, 14 deletions
diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-02-CRYPTSETUP/test.sh index 545602e17a..71709f7d58 100755 --- a/test/TEST-02-CRYPTSETUP/test.sh +++ b/test/TEST-02-CRYPTSETUP/test.sh @@ -45,6 +45,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] diff --git a/test/TEST-03-JOBS/test.sh b/test/TEST-03-JOBS/test.sh index 08e5cfe6c8..93a387df59 100755 --- a/test/TEST-03-JOBS/test.sh +++ b/test/TEST-03-JOBS/test.sh @@ -19,6 +19,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] diff --git a/test/TEST-04-JOURNAL/test.sh b/test/TEST-04-JOURNAL/test.sh index 30e7b181b2..33bfcbf681 100755 --- a/test/TEST-04-JOURNAL/test.sh +++ b/test/TEST-04-JOURNAL/test.sh @@ -18,11 +18,18 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-journal.sh diff --git a/test/TEST-05-RLIMITS/test.sh b/test/TEST-05-RLIMITS/test.sh index a1b855c5fb..3eb2165796 100755 --- a/test/TEST-05-RLIMITS/test.sh +++ b/test/TEST-05-RLIMITS/test.sh @@ -18,6 +18,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + cat >$initdir/etc/systemd/system.conf <<EOF [Manager] DefaultLimitNOFILE=10000:16384 @@ -27,7 +35,6 @@ EOF cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-rlimits.sh diff --git a/test/TEST-06-SELINUX/test.sh b/test/TEST-06-SELINUX/test.sh index 604ede5b2b..0c924ecbbd 100755 --- a/test/TEST-06-SELINUX/test.sh +++ b/test/TEST-06-SELINUX/test.sh @@ -33,7 +33,6 @@ test_setup() { cat <<EOF >$initdir/etc/systemd/system/testsuite.service [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-selinux-checks.sh diff --git a/test/TEST-07-ISSUE-1981/test.sh b/test/TEST-07-ISSUE-1981/test.sh index 88d143e479..499a36038c 100755 --- a/test/TEST-07-ISSUE-1981/test.sh +++ b/test/TEST-07-ISSUE-1981/test.sh @@ -21,11 +21,18 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-segfault.sh diff --git a/test/TEST-08-ISSUE-2730/test.sh b/test/TEST-08-ISSUE-2730/test.sh index 90bf133c6a..b01df3656b 100755 --- a/test/TEST-08-ISSUE-2730/test.sh +++ b/test/TEST-08-ISSUE-2730/test.sh @@ -25,7 +25,6 @@ test_setup() { cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/bin/sh -x -c 'mount -o remount,rw /dev/sda1 && echo OK > /testok; systemctl poweroff' diff --git a/test/TEST-09-ISSUE-2691/test.sh b/test/TEST-09-ISSUE-2691/test.sh index 40eac30076..01eb4dbac8 100755 --- a/test/TEST-09-ISSUE-2691/test.sh +++ b/test/TEST-09-ISSUE-2691/test.sh @@ -24,7 +24,6 @@ test_setup() { cat >$initdir/etc/systemd/system/testsuite.service <<'EOF' [Unit] Description=Testsuite service -After=multi-user.target [Service] Type=oneshot diff --git a/test/TEST-10-ISSUE-2467/test.sh b/test/TEST-10-ISSUE-2467/test.sh index e61f5acd3c..d8959187a1 100755 --- a/test/TEST-10-ISSUE-2467/test.sh +++ b/test/TEST-10-ISSUE-2467/test.sh @@ -23,7 +23,6 @@ test_setup() { cat >$initdir/etc/systemd/system/testsuite.service <<'EOF' [Unit] Description=Testsuite service -After=multi-user.target [Service] Type=oneshot diff --git a/test/TEST-11-ISSUE-3166/test.sh b/test/TEST-11-ISSUE-3166/test.sh index 8aae4d5ed9..6cde7fd7ea 100755 --- a/test/TEST-11-ISSUE-3166/test.sh +++ b/test/TEST-11-ISSUE-3166/test.sh @@ -20,11 +20,18 @@ test_setup() { setup_basic_environment dracut_install false touch + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-fail-on-restart.sh diff --git a/test/TEST-12-ISSUE-3171/test.sh b/test/TEST-12-ISSUE-3171/test.sh index 559fa469cd..0c267e11a6 100755 --- a/test/TEST-12-ISSUE-3171/test.sh +++ b/test/TEST-12-ISSUE-3171/test.sh @@ -20,6 +20,14 @@ test_setup() { setup_basic_environment dracut_install cat mv stat nc + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] @@ -31,7 +39,6 @@ ExecStart=/test-socket-group.sh Type=oneshot EOF - cat >$initdir/test-socket-group.sh <<'EOF' #!/bin/bash set -x diff --git a/test/TEST-13-NSPAWN-SMOKE/test.sh b/test/TEST-13-NSPAWN-SMOKE/test.sh index f485a9259c..75e214c008 100755 --- a/test/TEST-13-NSPAWN-SMOKE/test.sh +++ b/test/TEST-13-NSPAWN-SMOKE/test.sh @@ -20,6 +20,14 @@ test_setup() { setup_basic_environment dracut_install busybox chmod rmdir unshare ip + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + cp create-busybox-container $initdir/ ./create-busybox-container $initdir/nc-container @@ -29,7 +37,6 @@ test_setup() { cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-nspawn.sh diff --git a/test/TEST-14-MACHINE-ID/test.sh b/test/TEST-14-MACHINE-ID/test.sh index 62003b91b6..9435834204 100755 --- a/test/TEST-14-MACHINE-ID/test.sh +++ b/test/TEST-14-MACHINE-ID/test.sh @@ -25,7 +25,6 @@ test_setup() { cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/bin/sh -e -x -c '/test-machine-id-setup.sh; systemctl --state=failed --no-legend --no-pager > /failed ; echo OK > /testok' diff --git a/test/TEST-15-DROPIN/testsuite.service b/test/TEST-15-DROPIN/testsuite.service index d9790c2610..4c9f65e2b1 100644 --- a/test/TEST-15-DROPIN/testsuite.service +++ b/test/TEST-15-DROPIN/testsuite.service @@ -1,6 +1,5 @@ [Unit] Description=Testsuite service -After=multi-user.target [Service] ExecStart=/test-dropin.sh diff --git a/test/TEST-17-UDEV-WANTS/test.sh b/test/TEST-17-UDEV-WANTS/test.sh index 24989ebcf6..074771ab75 100755 --- a/test/TEST-17-UDEV-WANTS/test.sh +++ b/test/TEST-17-UDEV-WANTS/test.sh @@ -6,7 +6,7 @@ TEST_DESCRIPTION="UDEV SYSTEMD_WANTS property" TEST_NO_NSPAWN=1 . $TEST_BASE_DIR/test-functions -QEMU_TIMEOUT=180 +QEMU_TIMEOUT=300 test_setup() { create_empty_image diff --git a/test/TEST-18-FAILUREACTION/test.sh b/test/TEST-18-FAILUREACTION/test.sh index e48ba9bac3..783b3aac6e 100755 --- a/test/TEST-18-FAILUREACTION/test.sh +++ b/test/TEST-18-FAILUREACTION/test.sh @@ -35,6 +35,13 @@ EOF ) || return 1 setup_nspawn_root + # mask some services that we do not want to run in these tests + ln -s /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -s /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -s /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -s /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ddebug "umount $TESTDIR/root" umount $TESTDIR/root } diff --git a/test/TEST-19-DELEGATE/test.sh b/test/TEST-19-DELEGATE/test.sh index 75e13f8cf2..bb0c5057b2 100755 --- a/test/TEST-19-DELEGATE/test.sh +++ b/test/TEST-19-DELEGATE/test.sh @@ -20,6 +20,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] diff --git a/test/TEST-20-MAINPIDGAMES/test.sh b/test/TEST-20-MAINPIDGAMES/test.sh index b14083a256..4ec8081478 100755 --- a/test/TEST-20-MAINPIDGAMES/test.sh +++ b/test/TEST-20-MAINPIDGAMES/test.sh @@ -17,6 +17,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] diff --git a/test/TEST-22-TMPFILES/testsuite.service b/test/TEST-22-TMPFILES/testsuite.service index 123b12790f..a19174e795 100644 --- a/test/TEST-22-TMPFILES/testsuite.service +++ b/test/TEST-22-TMPFILES/testsuite.service @@ -1,6 +1,6 @@ [Unit] Description=Testsuite service -After=multi-user.target +After=systemd-tmpfiles-setup.service [Service] WorkingDirectory=/testsuite diff --git a/test/TEST-23-TYPE-EXEC/test.sh b/test/TEST-23-TYPE-EXEC/test.sh index bdcea239a7..2e76451f5b 100755 --- a/test/TEST-23-TYPE-EXEC/test.sh +++ b/test/TEST-23-TYPE-EXEC/test.sh @@ -17,6 +17,14 @@ test_setup() { setup_basic_environment + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + # setup the testsuite service cat >$initdir/etc/systemd/system/testsuite.service <<EOF [Unit] |