From 0c028a2b70077d130adfdd3c14a3a552aa316c7e Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 13 Mar 2025 11:13:44 +0100 Subject: [PATCH] pid1: don't connect to oomd in test runs (cherry picked from commit ec5bcf0b699bcd9d6cc597a73317f0540031ad20) --- src/core/core-varlink.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/core/core-varlink.c b/src/core/core-varlink.c index 8cdff3a9748..ceffb76def6 100644 --- a/src/core/core-varlink.c +++ b/src/core/core-varlink.c @@ -160,6 +160,9 @@ static int manager_varlink_send_managed_oom_initial(Manager *m) { if (!MANAGER_IS_USER(m)) return 0; + if (MANAGER_IS_TEST_RUN(m)) + return 0; + assert(m->managed_oom_varlink); r = build_managed_oom_cgroups_json(m, &v); @@ -206,6 +209,9 @@ static int manager_varlink_managed_oom_connect(Manager *m) { if (!MANAGER_IS_USER(m)) return -EINVAL; + if (MANAGER_IS_TEST_RUN(m)) + return 0; + r = sd_varlink_connect_address(&link, VARLINK_ADDR_PATH_MANAGED_OOM_USER); if (r == -ENOENT) return 0; @@ -245,6 +251,9 @@ int manager_varlink_send_managed_oom_update(Unit *u) { if (!UNIT_VTABLE(u)->can_set_managed_oom || !u->manager) return 0; + if (MANAGER_IS_TEST_RUN(u->manager)) + return 0; + crt = unit_get_cgroup_runtime(u); if (!crt || !crt->cgroup_path) return 0; -- 2.47.3