From 642744b49292d8e232e0d04ae23d6c42cd4b1063 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 4 Sep 2025 05:12:21 +0900 Subject: [PATCH] test: move test units to their own directories This also add test cases for verifying loopy.service and friends, which was added by e66047ff62c971eefa32b42373420d61e3f2a9c1 but never used in integration tests. --- src/test/test-cgroup-mask.c | 2 +- src/test/test-cgroup-unit-default.c | 2 +- src/test/test-engine.c | 2 +- src/test/test-sched-prio.c | 2 +- ...T-23-UNIT-FILE-ExtraFileDescriptors-child.sh | 2 +- .../TEST-23-UNIT-FILE-openfile-child.sh | 2 +- .../TEST-23-UNIT-FILE-short-lived.service | 2 +- .../TEST-23-UNIT-FILE-short-lived.sh | 0 .../success-failure-test-failure.service | 0 .../success-failure-test-success.service | 0 .../success-failure-test.service | 0 .../TEST-38-FREEZER-sleep.service | 0 .../TEST-55-OOMD-testbloat.service | 0 .../TEST-55-OOMD-testchill.service | 0 .../TEST-55-OOMD-testmunch.service | 0 .../TEST-55-OOMD-workload.slice | 0 .../TEST-55-OOMD-workload.slice.d/99-oom.conf | 0 .../TEST-62-RESTRICT-IFACES-1.service | 0 .../TEST-62-RESTRICT-IFACES-2.service | 0 .../TEST-62-RESTRICT-IFACES-3.service | 0 .../TEST-62-RESTRICT-IFACES-4.service | 0 .../TEST-62-RESTRICT-IFACES-5.service | 0 .../TEST-62-RESTRICT-IFACES-6.service | 0 .../TEST-65-ANALYZE.units}/loopy.service | 0 .../loopy.service.d/compat.conf | 0 .../TEST-65-ANALYZE.units}/loopy2.service | 0 .../TEST-65-ANALYZE.units}/loopy3.service | 0 .../TEST-65-ANALYZE.units}/loopy4.service | 0 ...66-DEVICE-ISOLATION-device-isolation.service | 0 test/meson.build | 17 +++++++++++++---- .../daughter.service | 0 .../grandchild.service | 0 test/{units => test-cgroup-mask}/nomem.slice | 0 .../nomemleaf.service | 0 .../parent-deep.slice | 0 test/{units => test-cgroup-mask}/parent.slice | 0 test/{units => test-cgroup-mask}/son.service | 0 .../dml-discard-empty.service | 0 .../dml-discard-set-ml.service | 0 .../dml-discard.slice | 0 .../dml-override-empty.service | 0 .../dml-override.slice | 0 .../dml-passthrough-empty.service | 0 .../dml-passthrough-set-dml.service | 0 .../dml-passthrough-set-ml.service | 0 .../dml-passthrough.slice | 0 .../dml.slice | 0 test/{units => test-engine}/a-conj.service | 0 test/{units => test-engine}/a.service | 0 test/{units => test-engine}/b.service | 0 test/{units => test-engine}/basic.target | 0 test/{units => test-engine}/c.service | 0 test/{units => test-engine}/d.service | 0 test/{units => test-engine}/e.service | 0 test/{units => test-engine}/f.service | 0 test/{units => test-engine}/g.service | 0 test/{units => test-engine}/h.service | 0 test/{units => test-engine}/i.service | 0 test/{units => test-engine}/sysinit.target | 6 ++++-- .../unit-.service.d/10-override.conf | 0 .../unit-with-.service.d/20-override.conf | 0 .../20-override.conf | 0 .../30-override.conf | 0 .../unit-with-multiple-dashes.service | 0 .../10-override.conf | 0 .../sched_idle_bad.service | 0 .../sched_idle_ok.service | 0 .../sched_rr_bad.service | 0 .../sched_rr_change.service | 0 .../sched_rr_ok.service | 0 .../TEST-23-UNIT-FILE.ExtraFileDescriptors.sh | 4 ++-- test/units/TEST-23-UNIT-FILE.openfile.sh | 4 ++-- test/units/TEST-65-ANALYZE.sh | 6 ++++++ test/units/shutdown.target | 14 -------------- test/units/sockets.target | 12 ------------ test/units/timers.target | 15 --------------- 76 files changed, 34 insertions(+), 58 deletions(-) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh (89%) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/TEST-23-UNIT-FILE-openfile-child.sh (89%) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/TEST-23-UNIT-FILE-short-lived.sh (100%) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/success-failure-test-failure.service (100%) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/success-failure-test-success.service (100%) rename test/{units => integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units}/success-failure-test.service (100%) rename test/{units => integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units}/TEST-38-FREEZER-sleep.service (100%) rename test/{units => integration-tests/TEST-55-OOMD/TEST-55-OOMD.units}/TEST-55-OOMD-testbloat.service (100%) rename test/{units => integration-tests/TEST-55-OOMD/TEST-55-OOMD.units}/TEST-55-OOMD-testchill.service (100%) rename test/{units => integration-tests/TEST-55-OOMD/TEST-55-OOMD.units}/TEST-55-OOMD-testmunch.service (100%) rename test/{units => integration-tests/TEST-55-OOMD/TEST-55-OOMD.units}/TEST-55-OOMD-workload.slice (100%) rename test/{units => integration-tests/TEST-55-OOMD/TEST-55-OOMD.units}/TEST-55-OOMD-workload.slice.d/99-oom.conf (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-1.service (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-2.service (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-3.service (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-4.service (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-5.service (100%) rename test/{units => integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units}/TEST-62-RESTRICT-IFACES-6.service (100%) rename test/{units => integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units}/loopy.service (100%) rename test/{units => integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units}/loopy.service.d/compat.conf (100%) rename test/{units => integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units}/loopy2.service (100%) rename test/{units => integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units}/loopy3.service (100%) rename test/{units => integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units}/loopy4.service (100%) rename test/{units => integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units}/TEST-66-DEVICE-ISOLATION-device-isolation.service (100%) rename test/{units => test-cgroup-mask}/daughter.service (100%) rename test/{units => test-cgroup-mask}/grandchild.service (100%) rename test/{units => test-cgroup-mask}/nomem.slice (100%) rename test/{units => test-cgroup-mask}/nomemleaf.service (100%) rename test/{units => test-cgroup-mask}/parent-deep.slice (100%) rename test/{units => test-cgroup-mask}/parent.slice (100%) rename test/{units => test-cgroup-mask}/son.service (100%) rename test/{units => test-cgroup-unit-default}/dml-discard-empty.service (100%) rename test/{units => test-cgroup-unit-default}/dml-discard-set-ml.service (100%) rename test/{units => test-cgroup-unit-default}/dml-discard.slice (100%) rename test/{units => test-cgroup-unit-default}/dml-override-empty.service (100%) rename test/{units => test-cgroup-unit-default}/dml-override.slice (100%) rename test/{units => test-cgroup-unit-default}/dml-passthrough-empty.service (100%) rename test/{units => test-cgroup-unit-default}/dml-passthrough-set-dml.service (100%) rename test/{units => test-cgroup-unit-default}/dml-passthrough-set-ml.service (100%) rename test/{units => test-cgroup-unit-default}/dml-passthrough.slice (100%) rename test/{units => test-cgroup-unit-default}/dml.slice (100%) rename test/{units => test-engine}/a-conj.service (100%) rename test/{units => test-engine}/a.service (100%) rename test/{units => test-engine}/b.service (100%) rename test/{units => test-engine}/basic.target (100%) rename test/{units => test-engine}/c.service (100%) rename test/{units => test-engine}/d.service (100%) rename test/{units => test-engine}/e.service (100%) rename test/{units => test-engine}/f.service (100%) rename test/{units => test-engine}/g.service (100%) rename test/{units => test-engine}/h.service (100%) rename test/{units => test-engine}/i.service (100%) rename test/{units => test-engine}/sysinit.target (86%) rename test/{units => test-engine}/unit-.service.d/10-override.conf (100%) rename test/{units => test-engine}/unit-with-.service.d/20-override.conf (100%) rename test/{units => test-engine}/unit-with-multiple-.service.d/20-override.conf (100%) rename test/{units => test-engine}/unit-with-multiple-.service.d/30-override.conf (100%) rename test/{units => test-engine}/unit-with-multiple-dashes.service (100%) rename test/{units => test-engine}/unit-with-multiple-dashes.service.d/10-override.conf (100%) rename test/{units => test-sched-prio}/sched_idle_bad.service (100%) rename test/{units => test-sched-prio}/sched_idle_ok.service (100%) rename test/{units => test-sched-prio}/sched_rr_bad.service (100%) rename test/{units => test-sched-prio}/sched_rr_change.service (100%) rename test/{units => test-sched-prio}/sched_rr_ok.service (100%) delete mode 100644 test/units/shutdown.target delete mode 100644 test/units/sockets.target delete mode 100644 test/units/timers.target diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 2a39d344ee1..3dcb5fde830 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -32,7 +32,7 @@ TEST_RET(cgroup_mask, .sd_booted = true) { /* Prepare the manager. */ _cleanup_free_ char *unit_dir = NULL; - ASSERT_OK(get_testdata_dir("units", &unit_dir)); + ASSERT_OK(get_testdata_dir("test-cgroup-mask", &unit_dir)); ASSERT_OK(setenv_unit_path(unit_dir)); assert_se(runtime_dir = setup_fake_runtime_dir()); r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m); diff --git a/src/test/test-cgroup-unit-default.c b/src/test/test-cgroup-unit-default.c index 2e53b0e1c8d..a8415241341 100644 --- a/src/test/test-cgroup-unit-default.c +++ b/src/test/test-cgroup-unit-default.c @@ -21,7 +21,7 @@ TEST_RET(default_memory_low, .sd_booted = true) { return log_tests_skipped("cgroupfs not available"); _cleanup_free_ char *unit_dir = NULL; - ASSERT_OK(get_testdata_dir("units", &unit_dir)); + ASSERT_OK(get_testdata_dir("test-cgroup-unit-default", &unit_dir)); ASSERT_OK(setenv_unit_path(unit_dir)); assert_se(runtime_dir = setup_fake_runtime_dir()); r = manager_new(RUNTIME_SCOPE_USER, MANAGER_TEST_RUN_BASIC, &m); diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 56b7920d8d7..06a1d9e6fd4 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ _cleanup_free_ char *unit_dir = NULL; - ASSERT_OK(get_testdata_dir("units", &unit_dir)); + ASSERT_OK(get_testdata_dir("test-engine", &unit_dir)); ASSERT_OK(setenv_unit_path(unit_dir)); assert_se(runtime_dir = setup_fake_runtime_dir()); diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index ca0d75d132b..1dfa91d10a4 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -25,7 +25,7 @@ int main(int argc, char *argv[]) { /* prepare the test */ _cleanup_free_ char *unit_dir = NULL; - ASSERT_OK(get_testdata_dir("units", &unit_dir)); + ASSERT_OK(get_testdata_dir("test-sched-prio", &unit_dir)); ASSERT_OK(setenv_unit_path(unit_dir)); assert_se(runtime_dir = setup_fake_runtime_dir()); diff --git a/test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh similarity index 89% rename from test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh index 8b182955b5c..2b3a6d368fb 100755 --- a/test/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh +++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh @@ -4,7 +4,7 @@ set -eux set -o pipefail # shellcheck source=test/units/util.sh -. "$(dirname "$0")"/util.sh +. "$(dirname "$0")"/../units/util.sh assert_eq "$LISTEN_FDS" "$1" assert_eq "$LISTEN_FDNAMES" "$2" diff --git a/test/units/TEST-23-UNIT-FILE-openfile-child.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh similarity index 89% rename from test/units/TEST-23-UNIT-FILE-openfile-child.sh rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh index 4828b9dc10d..9ed6509affe 100755 --- a/test/units/TEST-23-UNIT-FILE-openfile-child.sh +++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh @@ -4,7 +4,7 @@ set -eux set -o pipefail # shellcheck source=test/units/util.sh -. "$(dirname "$0")"/util.sh +. "$(dirname "$0")"/../units/util.sh assert_eq "$LISTEN_FDS" "$1" assert_eq "$LISTEN_FDNAMES" "$2" diff --git a/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service index ac9583f9169..973d5799df8 100644 --- a/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service +++ b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.service @@ -8,4 +8,4 @@ StartLimitBurst=15 StartLimitIntervalSec=1h [Service] -ExecStart=/usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-short-lived.sh +ExecStart=/usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh diff --git a/test/units/TEST-23-UNIT-FILE-short-lived.sh b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh similarity index 100% rename from test/units/TEST-23-UNIT-FILE-short-lived.sh rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-short-lived.sh diff --git a/test/units/success-failure-test-failure.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-failure.service similarity index 100% rename from test/units/success-failure-test-failure.service rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-failure.service diff --git a/test/units/success-failure-test-success.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-success.service similarity index 100% rename from test/units/success-failure-test-success.service rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test-success.service diff --git a/test/units/success-failure-test.service b/test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test.service similarity index 100% rename from test/units/success-failure-test.service rename to test/integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units/success-failure-test.service diff --git a/test/units/TEST-38-FREEZER-sleep.service b/test/integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units/TEST-38-FREEZER-sleep.service similarity index 100% rename from test/units/TEST-38-FREEZER-sleep.service rename to test/integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units/TEST-38-FREEZER-sleep.service diff --git a/test/units/TEST-55-OOMD-testbloat.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service similarity index 100% rename from test/units/TEST-55-OOMD-testbloat.service rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testbloat.service diff --git a/test/units/TEST-55-OOMD-testchill.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testchill.service similarity index 100% rename from test/units/TEST-55-OOMD-testchill.service rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testchill.service diff --git a/test/units/TEST-55-OOMD-testmunch.service b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service similarity index 100% rename from test/units/TEST-55-OOMD-testmunch.service rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-testmunch.service diff --git a/test/units/TEST-55-OOMD-workload.slice b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice similarity index 100% rename from test/units/TEST-55-OOMD-workload.slice rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice diff --git a/test/units/TEST-55-OOMD-workload.slice.d/99-oom.conf b/test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice.d/99-oom.conf similarity index 100% rename from test/units/TEST-55-OOMD-workload.slice.d/99-oom.conf rename to test/integration-tests/TEST-55-OOMD/TEST-55-OOMD.units/TEST-55-OOMD-workload.slice.d/99-oom.conf diff --git a/test/units/TEST-62-RESTRICT-IFACES-1.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-1.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-1.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-1.service diff --git a/test/units/TEST-62-RESTRICT-IFACES-2.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-2.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-2.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-2.service diff --git a/test/units/TEST-62-RESTRICT-IFACES-3.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-3.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-3.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-3.service diff --git a/test/units/TEST-62-RESTRICT-IFACES-4.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-4.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-4.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-4.service diff --git a/test/units/TEST-62-RESTRICT-IFACES-5.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-5.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-5.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-5.service diff --git a/test/units/TEST-62-RESTRICT-IFACES-6.service b/test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-6.service similarity index 100% rename from test/units/TEST-62-RESTRICT-IFACES-6.service rename to test/integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units/TEST-62-RESTRICT-IFACES-6.service diff --git a/test/units/loopy.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service similarity index 100% rename from test/units/loopy.service rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service diff --git a/test/units/loopy.service.d/compat.conf b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service.d/compat.conf similarity index 100% rename from test/units/loopy.service.d/compat.conf rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy.service.d/compat.conf diff --git a/test/units/loopy2.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy2.service similarity index 100% rename from test/units/loopy2.service rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy2.service diff --git a/test/units/loopy3.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy3.service similarity index 100% rename from test/units/loopy3.service rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy3.service diff --git a/test/units/loopy4.service b/test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy4.service similarity index 100% rename from test/units/loopy4.service rename to test/integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units/loopy4.service diff --git a/test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service b/test/integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units/TEST-66-DEVICE-ISOLATION-device-isolation.service similarity index 100% rename from test/units/TEST-66-DEVICE-ISOLATION-device-isolation.service rename to test/integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units/TEST-66-DEVICE-ISOLATION-device-isolation.service diff --git a/test/meson.build b/test/meson.build index 7b760dc5724..4cdd2f43036 100644 --- a/test/meson.build +++ b/test/meson.build @@ -339,15 +339,18 @@ if install_tests 'auxv', 'journal-data', 'knot-data', - 'test-journals', - 'units', + 'test-cgroup-mask', + 'test-cgroup-unit-default', + 'test-engine', 'test-execute', 'test-fstab-generator', + 'test-journals', + 'test-network', + 'test-network-generator-conversion', 'test-path', 'test-path-util', + 'test-sched-prio', 'test-umount', - 'test-network', - 'test-network-generator-conversion', 'integration-tests/TEST-07-PID1/TEST-07-PID1.units', 'integration-tests/TEST-03-JOBS/TEST-03-JOBS.units', 'integration-tests/TEST-04-JOURNAL/TEST-04-JOURNAL.units', @@ -355,9 +358,15 @@ if install_tests 'integration-tests/TEST-16-EXTEND-TIMEOUT/TEST-16-EXTEND-TIMEOUT.units', 'integration-tests/TEST-23-UNIT-FILE/TEST-23-UNIT-FILE.units', 'integration-tests/TEST-30-ONCLOCKCHANGE/TEST-30-ONCLOCKCHANGE.units', + 'integration-tests/TEST-38-FREEZER/TEST-38-FREEZER.units', 'integration-tests/TEST-52-HONORFIRSTSHUTDOWN/TEST-52-HONORFIRSTSHUTDOWN.units', + 'integration-tests/TEST-55-OOMD/TEST-55-OOMD.units', + 'integration-tests/TEST-62-RESTRICT-IFACES/TEST-62-RESTRICT-IFACES.units', 'integration-tests/TEST-63-PATH/TEST-63-PATH.units', + 'integration-tests/TEST-65-ANALYZE/TEST-65-ANALYZE.units', + 'integration-tests/TEST-66-DEVICE-ISOLATION/TEST-66-DEVICE-ISOLATION.units', 'integration-tests/TEST-80-NOTIFYACCESS/TEST-80-NOTIFYACCESS.units', + 'units', ] foreach subdir : testdata_subdirs diff --git a/test/units/daughter.service b/test/test-cgroup-mask/daughter.service similarity index 100% rename from test/units/daughter.service rename to test/test-cgroup-mask/daughter.service diff --git a/test/units/grandchild.service b/test/test-cgroup-mask/grandchild.service similarity index 100% rename from test/units/grandchild.service rename to test/test-cgroup-mask/grandchild.service diff --git a/test/units/nomem.slice b/test/test-cgroup-mask/nomem.slice similarity index 100% rename from test/units/nomem.slice rename to test/test-cgroup-mask/nomem.slice diff --git a/test/units/nomemleaf.service b/test/test-cgroup-mask/nomemleaf.service similarity index 100% rename from test/units/nomemleaf.service rename to test/test-cgroup-mask/nomemleaf.service diff --git a/test/units/parent-deep.slice b/test/test-cgroup-mask/parent-deep.slice similarity index 100% rename from test/units/parent-deep.slice rename to test/test-cgroup-mask/parent-deep.slice diff --git a/test/units/parent.slice b/test/test-cgroup-mask/parent.slice similarity index 100% rename from test/units/parent.slice rename to test/test-cgroup-mask/parent.slice diff --git a/test/units/son.service b/test/test-cgroup-mask/son.service similarity index 100% rename from test/units/son.service rename to test/test-cgroup-mask/son.service diff --git a/test/units/dml-discard-empty.service b/test/test-cgroup-unit-default/dml-discard-empty.service similarity index 100% rename from test/units/dml-discard-empty.service rename to test/test-cgroup-unit-default/dml-discard-empty.service diff --git a/test/units/dml-discard-set-ml.service b/test/test-cgroup-unit-default/dml-discard-set-ml.service similarity index 100% rename from test/units/dml-discard-set-ml.service rename to test/test-cgroup-unit-default/dml-discard-set-ml.service diff --git a/test/units/dml-discard.slice b/test/test-cgroup-unit-default/dml-discard.slice similarity index 100% rename from test/units/dml-discard.slice rename to test/test-cgroup-unit-default/dml-discard.slice diff --git a/test/units/dml-override-empty.service b/test/test-cgroup-unit-default/dml-override-empty.service similarity index 100% rename from test/units/dml-override-empty.service rename to test/test-cgroup-unit-default/dml-override-empty.service diff --git a/test/units/dml-override.slice b/test/test-cgroup-unit-default/dml-override.slice similarity index 100% rename from test/units/dml-override.slice rename to test/test-cgroup-unit-default/dml-override.slice diff --git a/test/units/dml-passthrough-empty.service b/test/test-cgroup-unit-default/dml-passthrough-empty.service similarity index 100% rename from test/units/dml-passthrough-empty.service rename to test/test-cgroup-unit-default/dml-passthrough-empty.service diff --git a/test/units/dml-passthrough-set-dml.service b/test/test-cgroup-unit-default/dml-passthrough-set-dml.service similarity index 100% rename from test/units/dml-passthrough-set-dml.service rename to test/test-cgroup-unit-default/dml-passthrough-set-dml.service diff --git a/test/units/dml-passthrough-set-ml.service b/test/test-cgroup-unit-default/dml-passthrough-set-ml.service similarity index 100% rename from test/units/dml-passthrough-set-ml.service rename to test/test-cgroup-unit-default/dml-passthrough-set-ml.service diff --git a/test/units/dml-passthrough.slice b/test/test-cgroup-unit-default/dml-passthrough.slice similarity index 100% rename from test/units/dml-passthrough.slice rename to test/test-cgroup-unit-default/dml-passthrough.slice diff --git a/test/units/dml.slice b/test/test-cgroup-unit-default/dml.slice similarity index 100% rename from test/units/dml.slice rename to test/test-cgroup-unit-default/dml.slice diff --git a/test/units/a-conj.service b/test/test-engine/a-conj.service similarity index 100% rename from test/units/a-conj.service rename to test/test-engine/a-conj.service diff --git a/test/units/a.service b/test/test-engine/a.service similarity index 100% rename from test/units/a.service rename to test/test-engine/a.service diff --git a/test/units/b.service b/test/test-engine/b.service similarity index 100% rename from test/units/b.service rename to test/test-engine/b.service diff --git a/test/units/basic.target b/test/test-engine/basic.target similarity index 100% rename from test/units/basic.target rename to test/test-engine/basic.target diff --git a/test/units/c.service b/test/test-engine/c.service similarity index 100% rename from test/units/c.service rename to test/test-engine/c.service diff --git a/test/units/d.service b/test/test-engine/d.service similarity index 100% rename from test/units/d.service rename to test/test-engine/d.service diff --git a/test/units/e.service b/test/test-engine/e.service similarity index 100% rename from test/units/e.service rename to test/test-engine/e.service diff --git a/test/units/f.service b/test/test-engine/f.service similarity index 100% rename from test/units/f.service rename to test/test-engine/f.service diff --git a/test/units/g.service b/test/test-engine/g.service similarity index 100% rename from test/units/g.service rename to test/test-engine/g.service diff --git a/test/units/h.service b/test/test-engine/h.service similarity index 100% rename from test/units/h.service rename to test/test-engine/h.service diff --git a/test/units/i.service b/test/test-engine/i.service similarity index 100% rename from test/units/i.service rename to test/test-engine/i.service diff --git a/test/units/sysinit.target b/test/test-engine/sysinit.target similarity index 86% rename from test/units/sysinit.target rename to test/test-engine/sysinit.target index eed3d16b458..5187605a3c4 100644 --- a/test/units/sysinit.target +++ b/test/test-engine/sysinit.target @@ -10,6 +10,8 @@ [Unit] Description=System Initialization Documentation=man:systemd.special(7) -Conflicts=emergency.service emergency.target + Wants=local-fs.target swap.target -After=local-fs.target swap.target emergency.service emergency.target +After=local-fs.target swap.target +Conflicts=emergency.service emergency.target +Before=emergency.service emergency.target diff --git a/test/units/unit-.service.d/10-override.conf b/test/test-engine/unit-.service.d/10-override.conf similarity index 100% rename from test/units/unit-.service.d/10-override.conf rename to test/test-engine/unit-.service.d/10-override.conf diff --git a/test/units/unit-with-.service.d/20-override.conf b/test/test-engine/unit-with-.service.d/20-override.conf similarity index 100% rename from test/units/unit-with-.service.d/20-override.conf rename to test/test-engine/unit-with-.service.d/20-override.conf diff --git a/test/units/unit-with-multiple-.service.d/20-override.conf b/test/test-engine/unit-with-multiple-.service.d/20-override.conf similarity index 100% rename from test/units/unit-with-multiple-.service.d/20-override.conf rename to test/test-engine/unit-with-multiple-.service.d/20-override.conf diff --git a/test/units/unit-with-multiple-.service.d/30-override.conf b/test/test-engine/unit-with-multiple-.service.d/30-override.conf similarity index 100% rename from test/units/unit-with-multiple-.service.d/30-override.conf rename to test/test-engine/unit-with-multiple-.service.d/30-override.conf diff --git a/test/units/unit-with-multiple-dashes.service b/test/test-engine/unit-with-multiple-dashes.service similarity index 100% rename from test/units/unit-with-multiple-dashes.service rename to test/test-engine/unit-with-multiple-dashes.service diff --git a/test/units/unit-with-multiple-dashes.service.d/10-override.conf b/test/test-engine/unit-with-multiple-dashes.service.d/10-override.conf similarity index 100% rename from test/units/unit-with-multiple-dashes.service.d/10-override.conf rename to test/test-engine/unit-with-multiple-dashes.service.d/10-override.conf diff --git a/test/units/sched_idle_bad.service b/test/test-sched-prio/sched_idle_bad.service similarity index 100% rename from test/units/sched_idle_bad.service rename to test/test-sched-prio/sched_idle_bad.service diff --git a/test/units/sched_idle_ok.service b/test/test-sched-prio/sched_idle_ok.service similarity index 100% rename from test/units/sched_idle_ok.service rename to test/test-sched-prio/sched_idle_ok.service diff --git a/test/units/sched_rr_bad.service b/test/test-sched-prio/sched_rr_bad.service similarity index 100% rename from test/units/sched_rr_bad.service rename to test/test-sched-prio/sched_rr_bad.service diff --git a/test/units/sched_rr_change.service b/test/test-sched-prio/sched_rr_change.service similarity index 100% rename from test/units/sched_rr_change.service rename to test/test-sched-prio/sched_rr_change.service diff --git a/test/units/sched_rr_ok.service b/test/test-sched-prio/sched_rr_ok.service similarity index 100% rename from test/units/sched_rr_ok.service rename to test/test-sched-prio/sched_rr_ok.service diff --git a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh index eaeee635db6..ddeeb854bca 100755 --- a/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh +++ b/test/units/TEST-23-UNIT-FILE.ExtraFileDescriptors.sh @@ -31,8 +31,8 @@ busctl call \ org.freedesktop.systemd1.Manager StartTransientUnit \ "ssa(sv)a(sa(sv))" "$TEST_UNIT" replace 4 \ ExecStart "a(sasb)" 1 \ - /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh \ - 5 /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh 2 "test:other" "Hello" "Extra" \ + /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh \ + 5 /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-ExtraFileDescriptors-child.sh 2 "test:other" "Hello" "Extra" \ true \ RemainAfterExit "b" true \ Type "s" oneshot \ diff --git a/test/units/TEST-23-UNIT-FILE.openfile.sh b/test/units/TEST-23-UNIT-FILE.openfile.sh index 644b6f458ed..0e2e22a01d2 100755 --- a/test/units/TEST-23-UNIT-FILE.openfile.sh +++ b/test/units/TEST-23-UNIT-FILE.openfile.sh @@ -28,7 +28,7 @@ systemd-run -p DynamicUser=yes -p EnvironmentFile=-/usr/lib/systemd/systemd-asan -p RemainAfterExit=yes \ --unit=test-23-openfile-existing.service \ --service-type=oneshot \ - /usr/lib/systemd/tests/testdata/units/TEST-23-UNIT-FILE-openfile-child.sh 2 "open.txt:colon" "Open" "File" + /usr/lib/systemd/tests/testdata/TEST-23-UNIT-FILE.units/TEST-23-UNIT-FILE-openfile-child.sh 2 "open.txt:colon" "Open" "File" cmp <(systemctl show -p OpenFile test-23-openfile-existing.service) <