test: switch TEST-02-CRYPTSETUP and TEST-24-UNITTESTS

When tests are executed serially (the default), it seems better to launch
the fairly generic test that runs the unittests early in the sequence.
Right now the tests are ordered based on when they were written, but
this doesn't make much sense.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-09-22 18:26:28 +02:00
parent abf6346c5e
commit 9309a23b95
8 changed files with 7 additions and 7 deletions

View File

@ -60,4 +60,4 @@ check_result_qemu() {
return $_ret
}
do_test "$@" 24
do_test "$@" 02

View File

@ -76,4 +76,4 @@ test_setup_cleanup() {
cleanup_initdir
}
do_test "$@" 02
do_test "$@" 24

View File

@ -1,8 +1,7 @@
[Unit]
Description=TEST-02-CRYPTSETUP
After=multi-user.target
Description=TEST-02-UNITTESTS
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok'
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
Type=oneshot

View File

@ -1,7 +1,8 @@
[Unit]
Description=TEST-24-UNIT-TESTS
Description=TEST-24-CRYPTSETUP
After=multi-user.target
[Service]
ExecStartPre=rm -f /failed /testok
ExecStart=/usr/lib/systemd/tests/testdata/units/%N.sh
ExecStart=sh -x -e -c 'mountpoint /var; systemctl --state=failed --no-legend --no-pager >/failed; echo OK >/testok'
Type=oneshot