dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-06-30 19:57:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

test-path: Skip test when we can't create a cgroup

Browse Source 
Instead of having CI runner specific checks, let's just
skip the test if we get EXIT_CGROUP which is what we get
when we can't create a cgroup. This makes the check work
independently of CI runner, and specifically also on github
actions.
This commit is contained in:
Daan De Meyer
2026-05-20 17:21:13 +00:00
parent fc7a32df38
commit 65f076f4b0
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/test/test-path.c
View File

@@ -121,19 +121,16 @@ static int _check_states(
last_service_result = service->result;
}
/* We may fail to start the service for reasons which are not under our control: cgroup
* setup denied, permission limits, resource exhaustion, etc. RESOURCES is terminal here
* for path units that don't auto-retry (PathChanged, PathModified) — they'd just sit in
* the failure state until the test timeout. Skip rather than wait. */
if (service->state == SERVICE_FAILED &&
(service->main_exec_status.status == EXIT_CGROUP || service->result == SERVICE_FAILURE_RESOURCES)) {
/* On a general purpose system we may fail to start the service for reasons which are
* not under our control: permission limits, resource exhaustion, etc. Let's skip the
* test in those cases. On CI we expect a properly configured environment, except for
* Salsa where we can't set up cgroups so the unit always fails. */
const char *ci = ci_environment();
if (!ci || streq(ci, "salsa-ci"))
return log_tests_skipped("Failed to start service %s: %s/%s",
UNIT(service)->id,
service_state_to_string(service->state),
service_result_to_string(service->result));
}
(service->main_exec_status.status == EXIT_CGROUP || service->result == SERVICE_FAILURE_RESOURCES))
return log_tests_skipped("Failed to start service %s: %s/%s",
UNIT(service)->id,
service_state_to_string(service->state),
service_result_to_string(service->result));
/* SERVICE_FAILURE_START_LIMIT_HIT is terminal: the unit won't recover without an explicit
* reset, so further looping is pointless. Skip the test rather than burning the 30s timeout. */