From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 22 Sep 2020 16:26:28 +0000 (+0200)
Subject: test: switch TEST-02-CRYPTSETUP and TEST-24-UNITTESTS
X-Git-Tag: v247-rc1~173^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9309a23b9513f9e36a4e7c7c7d917444ee2d97bc;p=thirdparty%2Fsystemd.git

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 e5553b0fb54..6143d3352b0 100755
--- 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 ef1811122e1..2a6ad310ed2 100755
--- 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 13e7ec36399..075e979d299 100644
--- 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 43d4816d485..e66f61388f1 100644
--- 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