diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-26 11:38:55 +0100 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-03-26 18:53:53 +0100 |
commit | 6aed6a11577b108b9a39f26aeae5e45d98f20c90 (patch) | |
tree | 71beb5fecd81b815c812da0680b5a4ca78c6ea14 /src/test/test-execute.c | |
parent | adca059d55fe0a126dbdd62911b0705ddf8e9b8a (diff) | |
download | systemd-6aed6a11577b108b9a39f26aeae5e45d98f20c90.tar.gz |
test-execute: provide custom failure message
test_exec_ambientcapabilities: exec-ambientcapabilities-nobody.service: exit status 0, expected 1
Sometimes we get just the last line, for example from the failure summary,
so make it as useful as possible.
Diffstat (limited to 'src/test/test-execute.c')
-rw-r--r-- | src/test/test-execute.c | 246 |
1 files changed, 128 insertions, 118 deletions
diff --git a/src/test/test-execute.c b/src/test/test-execute.c index f59d267776..9fd909df6a 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -33,7 +33,7 @@ static bool can_unshare; typedef void (*test_function_t)(Manager *m); -static void check(Manager *m, Unit *unit, int status_expected, int code_expected) { +static void check(const char *func, Manager *m, Unit *unit, int status_expected, int code_expected) { Service *service = NULL; usec_t ts; usec_t timeout = 2 * USEC_PER_MINUTE; @@ -62,8 +62,18 @@ static void check(Manager *m, Unit *unit, int status_expected, int code_expected } } exec_status_dump(&service->main_exec_status, stdout, "\t"); - assert_se(service->main_exec_status.status == status_expected); - assert_se(service->main_exec_status.code == code_expected); + if (service->main_exec_status.status != status_expected) { + log_error("%s: %s: exit status %d, expected %d", + func, unit->id, + service->main_exec_status.status, status_expected); + abort(); + } + if (service->main_exec_status.code != code_expected) { + log_error("%s: %s: exit code %d, expected %d", + func, unit->id, + service->main_exec_status.code, code_expected); + abort(); + } } static bool check_nobody_user_and_group(void) { @@ -148,21 +158,21 @@ static bool is_inaccessible_available(void) { return true; } -static void test(Manager *m, const char *unit_name, int status_expected, int code_expected) { +static void test(const char *func, Manager *m, const char *unit_name, int status_expected, int code_expected) { Unit *unit; assert_se(unit_name); assert_se(manager_load_startable_unit_or_warn(m, unit_name, NULL, &unit) >= 0); assert_se(unit_start(unit) >= 0); - check(m, unit, status_expected, code_expected); + check(func, m, unit, status_expected, code_expected); } static void test_exec_bindpaths(Manager *m) { assert_se(mkdir_p("/tmp/test-exec-bindpaths", 0755) >= 0); assert_se(mkdir_p("/tmp/test-exec-bindreadonlypaths", 0755) >= 0); - test(m, "exec-bindpaths.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-bindpaths.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); (void) rm_rf("/tmp/test-exec-bindpaths", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/tmp/test-exec-bindreadonlypaths", REMOVE_ROOT|REMOVE_PHYSICAL); @@ -180,8 +190,8 @@ static void test_exec_cpuaffinity(Manager *m) { return; } - test(m, "exec-cpuaffinity1.service", 0, CLD_EXITED); - test(m, "exec-cpuaffinity2.service", 0, CLD_EXITED); + test(__func__, m, "exec-cpuaffinity1.service", 0, CLD_EXITED); + test(__func__, m, "exec-cpuaffinity2.service", 0, CLD_EXITED); if (CPU_ISSET_S(1, CPU_ALLOC_SIZE(n), c) == 0 || CPU_ISSET_S(2, CPU_ALLOC_SIZE(n), c) == 0) { @@ -189,52 +199,52 @@ static void test_exec_cpuaffinity(Manager *m) { return; } - test(m, "exec-cpuaffinity3.service", 0, CLD_EXITED); + test(__func__, m, "exec-cpuaffinity3.service", 0, CLD_EXITED); } static void test_exec_workingdirectory(Manager *m) { assert_se(mkdir_p("/tmp/test-exec_workingdirectory", 0755) >= 0); - test(m, "exec-workingdirectory.service", 0, CLD_EXITED); - test(m, "exec-workingdirectory-trailing-dot.service", 0, CLD_EXITED); + test(__func__, m, "exec-workingdirectory.service", 0, CLD_EXITED); + test(__func__, m, "exec-workingdirectory-trailing-dot.service", 0, CLD_EXITED); (void) rm_rf("/tmp/test-exec_workingdirectory", REMOVE_ROOT|REMOVE_PHYSICAL); } static void test_exec_personality(Manager *m) { #if defined(__x86_64__) - test(m, "exec-personality-x86-64.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-x86-64.service", 0, CLD_EXITED); #elif defined(__s390__) - test(m, "exec-personality-s390.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-s390.service", 0, CLD_EXITED); #elif defined(__powerpc64__) # if __BYTE_ORDER == __BIG_ENDIAN - test(m, "exec-personality-ppc64.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-ppc64.service", 0, CLD_EXITED); # else - test(m, "exec-personality-ppc64le.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-ppc64le.service", 0, CLD_EXITED); # endif #elif defined(__aarch64__) - test(m, "exec-personality-aarch64.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-aarch64.service", 0, CLD_EXITED); #elif defined(__i386__) - test(m, "exec-personality-x86.service", 0, CLD_EXITED); + test(__func__, m, "exec-personality-x86.service", 0, CLD_EXITED); #else log_notice("Unknown personality, skipping %s", __func__); #endif } static void test_exec_ignoresigpipe(Manager *m) { - test(m, "exec-ignoresigpipe-yes.service", 0, CLD_EXITED); - test(m, "exec-ignoresigpipe-no.service", SIGPIPE, CLD_KILLED); + test(__func__, m, "exec-ignoresigpipe-yes.service", 0, CLD_EXITED); + test(__func__, m, "exec-ignoresigpipe-no.service", SIGPIPE, CLD_KILLED); } static void test_exec_privatetmp(Manager *m) { assert_se(touch("/tmp/test-exec_privatetmp") >= 0); - test(m, "exec-privatetmp-yes.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-privatetmp-no.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatetmp-yes.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-privatetmp-no.service", 0, CLD_EXITED); unlink("/tmp/test-exec_privatetmp"); } @@ -251,9 +261,9 @@ static void test_exec_privatedevices(Manager *m) { return; } - test(m, "exec-privatedevices-yes.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-privatedevices-no.service", 0, CLD_EXITED); - test(m, "exec-privatedevices-disabled-by-prefix.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-privatedevices-yes.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-privatedevices-no.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatedevices-disabled-by-prefix.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); /* We use capsh to test if the capabilities are * properly set, so be sure that it exists */ @@ -263,14 +273,14 @@ static void test_exec_privatedevices(Manager *m) { return; } - test(m, "exec-privatedevices-yes-capability-mknod.service", 0, CLD_EXITED); - test(m, "exec-privatedevices-no-capability-mknod.service", 0, CLD_EXITED); - test(m, "exec-privatedevices-yes-capability-sys-rawio.service", 0, CLD_EXITED); - test(m, "exec-privatedevices-no-capability-sys-rawio.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatedevices-yes-capability-mknod.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatedevices-no-capability-mknod.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatedevices-yes-capability-sys-rawio.service", 0, CLD_EXITED); + test(__func__, m, "exec-privatedevices-no-capability-sys-rawio.service", 0, CLD_EXITED); } static void test_exec_protecthome(Manager *m) { - test(m, "exec-protecthome-tmpfs-vs-protectsystem-strict.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-protecthome-tmpfs-vs-protectsystem-strict.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); } static void test_exec_protectkernelmodules(Manager *m) { @@ -291,23 +301,23 @@ static void test_exec_protectkernelmodules(Manager *m) { return; } - test(m, "exec-protectkernelmodules-no-capabilities.service", 0, CLD_EXITED); - test(m, "exec-protectkernelmodules-yes-capabilities.service", 0, CLD_EXITED); - test(m, "exec-protectkernelmodules-yes-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-protectkernelmodules-no-capabilities.service", 0, CLD_EXITED); + test(__func__, m, "exec-protectkernelmodules-yes-capabilities.service", 0, CLD_EXITED); + test(__func__, m, "exec-protectkernelmodules-yes-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); } static void test_exec_readonlypaths(Manager *m) { - test(m, "exec-readonlypaths-simple.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-readonlypaths-simple.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); if (path_is_read_only_fs("/var") > 0) { log_notice("Directory /var is readonly, skipping remaining tests in %s", __func__); return; } - test(m, "exec-readonlypaths.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-readonlypaths-with-bindpaths.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-readonlypaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-readonlypaths.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-readonlypaths-with-bindpaths.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-readonlypaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); } static void test_exec_readwritepaths(Manager *m) { @@ -317,7 +327,7 @@ static void test_exec_readwritepaths(Manager *m) { return; } - test(m, "exec-readwritepaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-readwritepaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); } static void test_exec_inaccessiblepaths(Manager *m) { @@ -327,22 +337,22 @@ static void test_exec_inaccessiblepaths(Manager *m) { return; } - test(m, "exec-inaccessiblepaths-sys.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-inaccessiblepaths-sys.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); if (path_is_read_only_fs("/") > 0) { log_notice("Root directory is readonly, skipping remaining tests in %s", __func__); return; } - test(m, "exec-inaccessiblepaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-inaccessiblepaths-mount-propagation.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); } static void test_exec_temporaryfilesystem(Manager *m) { - test(m, "exec-temporaryfilesystem-options.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-temporaryfilesystem-ro.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-temporaryfilesystem-rw.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-temporaryfilesystem-usr.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-temporaryfilesystem-options.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-temporaryfilesystem-ro.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-temporaryfilesystem-rw.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-temporaryfilesystem-usr.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); } static void test_exec_systemcallfilter(Manager *m) { @@ -354,10 +364,10 @@ static void test_exec_systemcallfilter(Manager *m) { return; } - test(m, "exec-systemcallfilter-not-failing.service", 0, CLD_EXITED); - test(m, "exec-systemcallfilter-not-failing2.service", 0, CLD_EXITED); - test(m, "exec-systemcallfilter-failing.service", SIGSYS, CLD_KILLED); - test(m, "exec-systemcallfilter-failing2.service", SIGSYS, CLD_KILLED); + test(__func__, m, "exec-systemcallfilter-not-failing.service", 0, CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-not-failing2.service", 0, CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-failing.service", SIGSYS, CLD_KILLED); + test(__func__, m, "exec-systemcallfilter-failing2.service", SIGSYS, CLD_KILLED); r = find_binary("python3", NULL); if (r < 0) { @@ -365,9 +375,9 @@ static void test_exec_systemcallfilter(Manager *m) { return; } - test(m, "exec-systemcallfilter-with-errno-name.service", errno_from_name("EILSEQ"), CLD_EXITED); - test(m, "exec-systemcallfilter-with-errno-number.service", 255, CLD_EXITED); - test(m, "exec-systemcallfilter-with-errno-multi.service", errno_from_name("EILSEQ"), CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-with-errno-name.service", errno_from_name("EILSEQ"), CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-with-errno-number.service", 255, CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-with-errno-multi.service", errno_from_name("EILSEQ"), CLD_EXITED); #endif } @@ -386,8 +396,8 @@ static void test_exec_systemcallerrornumber(Manager *m) { return; } - test(m, "exec-systemcallerrornumber-name.service", errno_from_name("EACCES"), CLD_EXITED); - test(m, "exec-systemcallerrornumber-number.service", 255, CLD_EXITED); + test(__func__, m, "exec-systemcallerrornumber-name.service", errno_from_name("EACCES"), CLD_EXITED); + test(__func__, m, "exec-systemcallerrornumber-number.service", 255, CLD_EXITED); #endif } @@ -398,13 +408,13 @@ static void test_exec_restrictnamespaces(Manager *m) { return; } - test(m, "exec-restrictnamespaces-no.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-restrictnamespaces-yes.service", 1, CLD_EXITED); - test(m, "exec-restrictnamespaces-mnt.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-restrictnamespaces-mnt-blacklist.service", 1, CLD_EXITED); - test(m, "exec-restrictnamespaces-merge-and.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-restrictnamespaces-merge-or.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); - test(m, "exec-restrictnamespaces-merge-all.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-no.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-yes.service", 1, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-mnt.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-mnt-blacklist.service", 1, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-merge-and.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-merge-or.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); + test(__func__, m, "exec-restrictnamespaces-merge-all.service", can_unshare ? 0 : EXIT_FAILURE, CLD_EXITED); #endif } @@ -415,7 +425,7 @@ static void test_exec_systemcallfilter_system(Manager *m) { return; } - test(m, "exec-systemcallfilter-system-user.service", 0, CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-system-user.service", 0, CLD_EXITED); if (!check_nobody_user_and_group()) { log_notice("nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__); @@ -427,12 +437,12 @@ static void test_exec_systemcallfilter_system(Manager *m) { return; } - test(m, "exec-systemcallfilter-system-user-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-systemcallfilter-system-user-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); #endif } static void test_exec_user(Manager *m) { - test(m, "exec-user.service", 0, CLD_EXITED); + test(__func__, m, "exec-user.service", 0, CLD_EXITED); if (!check_nobody_user_and_group()) { log_notice("nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__); @@ -444,11 +454,11 @@ static void test_exec_user(Manager *m) { return; } - test(m, "exec-user-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-user-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); } static void test_exec_group(Manager *m) { - test(m, "exec-group.service", 0, CLD_EXITED); + test(__func__, m, "exec-group.service", 0, CLD_EXITED); if (!check_nobody_user_and_group()) { log_notice("nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__); @@ -460,36 +470,36 @@ static void test_exec_group(Manager *m) { return; } - test(m, "exec-group-" NOBODY_GROUP_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-group-" NOBODY_GROUP_NAME ".service", 0, CLD_EXITED); } static void test_exec_supplementarygroups(Manager *m) { - test(m, "exec-supplementarygroups.service", 0, CLD_EXITED); - test(m, "exec-supplementarygroups-single-group.service", 0, CLD_EXITED); - test(m, "exec-supplementarygroups-single-group-user.service", 0, CLD_EXITED); - test(m, "exec-supplementarygroups-multiple-groups-default-group-user.service", 0, CLD_EXITED); - test(m, "exec-supplementarygroups-multiple-groups-withgid.service", 0, CLD_EXITED); - test(m, "exec-supplementarygroups-multiple-groups-withuid.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups-single-group.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups-single-group-user.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups-multiple-groups-default-group-user.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups-multiple-groups-withgid.service", 0, CLD_EXITED); + test(__func__, m, "exec-supplementarygroups-multiple-groups-withuid.service", 0, CLD_EXITED); } static void test_exec_dynamicuser(Manager *m) { - test(m, "exec-dynamicuser-fixeduser.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-fixeduser.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); if (check_user_has_group_with_same_name("adm")) - test(m, "exec-dynamicuser-fixeduser-adm.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-fixeduser-adm.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); if (check_user_has_group_with_same_name("games")) - test(m, "exec-dynamicuser-fixeduser-games.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-dynamicuser-fixeduser-one-supplementarygroup.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-dynamicuser-supplementarygroups.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); - test(m, "exec-dynamicuser-statedir.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-fixeduser-games.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-fixeduser-one-supplementarygroup.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-supplementarygroups.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-statedir.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); (void) rm_rf("/var/lib/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/private/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/private/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); - test(m, "exec-dynamicuser-statedir-migrate-step1.service", 0, CLD_EXITED); - test(m, "exec-dynamicuser-statedir-migrate-step2.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-statedir-migrate-step1.service", 0, CLD_EXITED); + test(__func__, m, "exec-dynamicuser-statedir-migrate-step2.service", can_unshare ? 0 : EXIT_NAMESPACE, CLD_EXITED); (void) rm_rf("/var/lib/test-dynamicuser-migrate", REMOVE_ROOT|REMOVE_PHYSICAL); (void) rm_rf("/var/lib/test-dynamicuser-migrate2", REMOVE_ROOT|REMOVE_PHYSICAL); @@ -498,10 +508,10 @@ static void test_exec_dynamicuser(Manager *m) { } static void test_exec_environment(Manager *m) { - test(m, "exec-environment-no-substitute.service", 0, CLD_EXITED); - test(m, "exec-environment.service", 0, CLD_EXITED); - test(m, "exec-environment-multiple.service", 0, CLD_EXITED); - test(m, "exec-environment-empty.service", 0, CLD_EXITED); + test(__func__, m, "exec-environment-no-substitute.service", 0, CLD_EXITED); + test(__func__, m, "exec-environment.service", 0, CLD_EXITED); + test(__func__, m, "exec-environment-multiple.service", 0, CLD_EXITED); + test(__func__, m, "exec-environment-empty.service", 0, CLD_EXITED); } static void test_exec_environmentfile(Manager *m) { @@ -521,7 +531,7 @@ static void test_exec_environmentfile(Manager *m) { r = write_string_file("/tmp/test-exec_environmentfile.conf", e, WRITE_STRING_FILE_CREATE); assert_se(r == 0); - test(m, "exec-environmentfile.service", 0, CLD_EXITED); + test(__func__, m, "exec-environmentfile.service", 0, CLD_EXITED); (void) unlink("/tmp/test-exec_environmentfile.conf"); } @@ -543,26 +553,26 @@ static void test_exec_passenvironment(Manager *m) { assert_se(setenv("VAR3", "$word 5 6", 1) == 0); assert_se(setenv("VAR4", "new\nline", 1) == 0); assert_se(setenv("VAR5", "passwordwithbackslashes", 1) == 0); - test(m, "exec-passenvironment.service", 0, CLD_EXITED); - test(m, "exec-passenvironment-repeated.service", 0, CLD_EXITED); - test(m, "exec-passenvironment-empty.service", 0, CLD_EXITED); + test(__func__, m, "exec-passenvironment.service", 0, CLD_EXITED); + test(__func__, m, "exec-passenvironment-repeated.service", 0, CLD_EXITED); + test(__func__, m, "exec-passenvironment-empty.service", 0, CLD_EXITED); assert_se(unsetenv("VAR1") == 0); assert_se(unsetenv("VAR2") == 0); assert_se(unsetenv("VAR3") == 0); assert_se(unsetenv("VAR4") == 0); assert_se(unsetenv("VAR5") == 0); - test(m, "exec-passenvironment-absent.service", 0, CLD_EXITED); + test(__func__, m, "exec-passenvironment-absent.service", 0, CLD_EXITED); } static void test_exec_umask(Manager *m) { - test(m, "exec-umask-default.service", 0, CLD_EXITED); - test(m, "exec-umask-0177.service", 0, CLD_EXITED); + test(__func__, m, "exec-umask-default.service", 0, CLD_EXITED); + test(__func__, m, "exec-umask-0177.service", 0, CLD_EXITED); } static void test_exec_runtimedirectory(Manager *m) { - test(m, "exec-runtimedirectory.service", 0, CLD_EXITED); - test(m, "exec-runtimedirectory-mode.service", 0, CLD_EXITED); - test(m, "exec-runtimedirectory-owner.service", 0, CLD_EXITED); + test(__func__, m, "exec-runtimedirectory.service", 0, CLD_EXITED); + test(__func__, m, "exec-runtimedirectory-mode.service", 0, CLD_EXITED); + test(__func__, m, "exec-runtimedirectory-owner.service", 0, CLD_EXITED); if (!check_nobody_user_and_group()) { log_notice("nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__); @@ -574,7 +584,7 @@ static void test_exec_runtimedirectory(Manager *m) { return; } - test(m, "exec-runtimedirectory-owner-" NOBODY_GROUP_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-runtimedirectory-owner-" NOBODY_GROUP_NAME ".service", 0, CLD_EXITED); } static void test_exec_capabilityboundingset(Manager *m) { @@ -593,14 +603,14 @@ static void test_exec_capabilityboundingset(Manager *m) { return; } - test(m, "exec-capabilityboundingset-simple.service", 0, CLD_EXITED); - test(m, "exec-capabilityboundingset-reset.service", 0, CLD_EXITED); - test(m, "exec-capabilityboundingset-merge.service", 0, CLD_EXITED); - test(m, "exec-capabilityboundingset-invert.service", 0, CLD_EXITED); + test(__func__, m, "exec-capabilityboundingset-simple.service", 0, CLD_EXITED); + test(__func__, m, "exec-capabilityboundingset-reset.service", 0, CLD_EXITED); + test(__func__, m, "exec-capabilityboundingset-merge.service", 0, CLD_EXITED); + test(__func__, m, "exec-capabilityboundingset-invert.service", 0, CLD_EXITED); } static void test_exec_basic(Manager *m) { - test(m, "exec-basic.service", 0, CLD_EXITED); + test(__func__, m, "exec-basic.service", 0, CLD_EXITED); } static void test_exec_ambientcapabilities(Manager *m) { @@ -622,8 +632,8 @@ static void test_exec_ambientcapabilities(Manager *m) { return; } - test(m, "exec-ambientcapabilities.service", 0, CLD_EXITED); - test(m, "exec-ambientcapabilities-merge.service", 0, CLD_EXITED); + test(__func__, m, "exec-ambientcapabilities.service", 0, CLD_EXITED); + test(__func__, m, "exec-ambientcapabilities-merge.service", 0, CLD_EXITED); if (!check_nobody_user_and_group()) { log_notice("nobody user/group is not synthesized or may conflict to other entries, skipping remaining tests in %s", __func__); @@ -635,8 +645,8 @@ static void test_exec_ambientcapabilities(Manager *m) { return; } - test(m, "exec-ambientcapabilities-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); - test(m, "exec-ambientcapabilities-merge-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-ambientcapabilities-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); + test(__func__, m, "exec-ambientcapabilities-merge-" NOBODY_USER_NAME ".service", 0, CLD_EXITED); } static void test_exec_privatenetwork(Manager *m) { @@ -648,52 +658,52 @@ static void test_exec_privatenetwork(Manager *m) { return; } - test(m, "exec-privatenetwork-yes.service", can_unshare ? 0 : EXIT_NETWORK, CLD_EXITED); + test(__func__, m, "exec-privatenetwork-yes.service", can_unshare ? 0 : EXIT_NETWORK, CLD_EXITED); } static void test_exec_oomscoreadjust(Manager *m) { - test(m, "exec-oomscoreadjust-positive.service", 0, CLD_EXITED); + test(__func__, m, "exec-oomscoreadjust-positive.service", 0, CLD_EXITED); if (detect_container() > 0) { log_notice("Testing in container, skipping remaining tests in %s", __func__); return; } - test(m, "exec-oomscoreadjust-negative.service", 0, CLD_EXITED); + test(__func__, m, "exec-oomscoreadjust-negative.service", 0, CLD_EXITED); } static void test_exec_ioschedulingclass(Manager *m) { - test(m, "exec-ioschedulingclass-none.service", 0, CLD_EXITED); - test(m, "exec-ioschedulingclass-idle.service", 0, CLD_EXITED); - test(m, "exec-ioschedulingclass-best-effort.service", 0, CLD_EXITED); + test(__func__, m, "exec-ioschedulingclass-none.service", 0, CLD_EXITED); + test(__func__, m, "exec-ioschedulingclass-idle.service", 0, CLD_EXITED); + test(__func__, m, "exec-ioschedulingclass-best-effort.service", 0, CLD_EXITED); if (detect_container() > 0) { log_notice("Testing in container, skipping remaining tests in %s", __func__); return; } - test(m, "exec-ioschedulingclass-realtime.service", 0, CLD_EXITED); + test(__func__, m, "exec-ioschedulingclass-realtime.service", 0, CLD_EXITED); } static void test_exec_unsetenvironment(Manager *m) { - test(m, "exec-unsetenvironment.service", 0, CLD_EXITED); + test(__func__, m, "exec-unsetenvironment.service", 0, CLD_EXITED); } static void test_exec_specifier(Manager *m) { - test(m, "exec-specifier.service", 0, CLD_EXITED); - test(m, "exec-specifier@foo-bar.service", 0, CLD_EXITED); - test(m, "exec-specifier-interpolation.service", 0, CLD_EXITED); + test(__func__, m, "exec-specifier.service", 0, CLD_EXITED); + test(__func__, m, "exec-specifier@foo-bar.service", 0, CLD_EXITED); + test(__func__, m, "exec-specifier-interpolation.service", 0, CLD_EXITED); } static void test_exec_standardinput(Manager *m) { - test(m, "exec-standardinput-data.service", 0, CLD_EXITED); - test(m, "exec-standardinput-file.service", 0, CLD_EXITED); + test(__func__, m, "exec-standardinput-data.service", 0, CLD_EXITED); + test(__func__, m, "exec-standardinput-file.service", 0, CLD_EXITED); } static void test_exec_standardoutput(Manager *m) { - test(m, "exec-standardoutput-file.service", 0, CLD_EXITED); + test(__func__, m, "exec-standardoutput-file.service", 0, CLD_EXITED); } static void test_exec_standardoutput_append(Manager *m) { - test(m, "exec-standardoutput-append.service", 0, CLD_EXITED); + test(__func__, m, "exec-standardoutput-append.service", 0, CLD_EXITED); } typedef struct test_entry { |