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.

diff --git a/test/TEST-02-CRYPTSETUP/Makefile b/test/TEST-02-UNITTESTS/Makefile
similarity index 100%
rename from test/TEST-02-CRYPTSETUP/Makefile
rename to test/TEST-02-UNITTESTS/Makefile

diff --git a/test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el b/test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el
similarity index 100%
rename from test/TEST-24-UNIT-TESTS/deny-list-ubuntu-ci-ppc64el
rename to test/TEST-02-UNITTESTS/deny-list-ubuntu-ci-ppc64el

diff --git a/test/TEST-24-UNIT-TESTS/test.sh b/test/TEST-02-UNITTESTS/test.sh
similarity index 98%
rename from test/TEST-24-UNIT-TESTS/test.sh
rename to test/TEST-02-UNITTESTS/test.sh
index e5553b0fb541f4502fef2d3556eac8b336597c5c..6143d3352b01ba56c46574ace65145b3173e5202 100755 (executable)
--- a/test/TEST-24-UNIT-TESTS/test.sh
+++ b/test/TEST-02-UNITTESTS/test.sh
@@ -60,4 +60,4 @@ check_result_qemu() {
     return $_ret
 }
 
-do_test "$@" 24
+do_test "$@" 02

diff --git a/test/TEST-24-UNIT-TESTS/Makefile b/test/TEST-24-CRYPTSETUP/Makefile
similarity index 100%
rename from test/TEST-24-UNIT-TESTS/Makefile
rename to test/TEST-24-CRYPTSETUP/Makefile

diff --git a/test/TEST-02-CRYPTSETUP/test.sh b/test/TEST-24-CRYPTSETUP/test.sh
similarity index 99%
rename from test/TEST-02-CRYPTSETUP/test.sh
rename to test/TEST-24-CRYPTSETUP/test.sh
index ef1811122e1346d0a632978cd14efa2bdeb2e439..2a6ad310ed24096c7a34c8d067477dad5b5c34df 100755 (executable)
--- a/test/TEST-02-CRYPTSETUP/test.sh
+++ b/test/TEST-24-CRYPTSETUP/test.sh
@@ -76,4 +76,4 @@ test_setup_cleanup() {
     cleanup_initdir
 }
 
-do_test "$@" 02
+do_test "$@" 24

diff --git a/test/units/testsuite-02.service b/test/units/testsuite-02.service
index 13e7ec363996a939c565d6a43249a86a6a0100b9..075e979d2997151163491b427e788f002bf5fef5 100644 (file)
--- a/test/units/testsuite-02.service
+++ b/test/units/testsuite-02.service
@@ -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

diff --git a/test/units/testsuite-24.sh b/test/units/testsuite-02.sh
similarity index 100%
rename from test/units/testsuite-24.sh
rename to test/units/testsuite-02.sh

diff --git a/test/units/testsuite-24.service b/test/units/testsuite-24.service
index 43d4816d4857e4449e1fd36ebc6e4fc347d1e75f..e66f61388f11e42a30a436253ca9d98e64e01768 100644 (file)
--- a/test/units/testsuite-24.service
+++ b/test/units/testsuite-24.service
@@ -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