From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 28 Jun 2025 19:00:16 +0000 (+0200)
Subject: test-cgroup-util: ignore -ENXIO in more places
X-Git-Tag: v258-rc1~206^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=145100836ec064a42989f157a0d11787c6130c64;p=thirdparty%2Fsystemd.git

test-cgroup-util: ignore -ENXIO in more places

In https://github.com/systemd/systemd/pull/38003, one test failed:
Unit tests / build (CLANG_ASAN_UBSAN):
src/test/test-cgroup-util.c:237: Assertion failed: Expected "r" to succeed, but got error: No such device or address

Checks for specific errors were added in ca82f0cbe2db096bc7ff81280b5683ea1beae534,
partially relaxed in e92d699dde746355bba893b2375b7937a52d9e05.
cg_pidref_get_unit() and cg_pid_get_slice() enter a deep chain of calls,
so it's hard to guess where the failure occurred. But those two calls
expect the cgroup path to be "well formed". When we're running in CI,
we don't have full control over what is happening on the machine,
so let's suppress that error too.
---

diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
index 3f3562c8785..8d6a4c39e76 100644
--- a/src/test/test-cgroup-util.c
+++ b/src/test/test-cgroup-util.c
@@ -234,9 +234,9 @@ TEST(proc, .sd_booted = true) {
                 r = cg_pid_get_path_shifted(pid.pid, NULL, &path_shifted);
                 ASSERT_OK_OR(r, -ESRCH);
                 r = cg_pidref_get_unit(&pid, &unit);
-                ASSERT_OK_OR(r, -ESRCH);
+                ASSERT_OK_OR(r, -ESRCH, -ENXIO);
                 r = cg_pid_get_slice(pid.pid, &slice);
-                ASSERT_OK_OR(r, -ESRCH);
+                ASSERT_OK_OR(r, -ESRCH, -ENXIO);
 
                 /* Not all processes belong to a specific user or a machine */
                 r = cg_pidref_get_owner_uid(&pid, &uid);