SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: fix assert when running test-cgroup in container

Browse Source 
When running in nspawn and thus from the namespaced root cgroup:

Paths for test:
//test-a
//test-b
src/test/test-cgroup.c:77: Assertion failed: Expected "path == test_b", got "/test-b != //test-b"

Use path_simplify() in the test like the code does, so that the results
always match
This commit is contained in:
Luca Boccassi
2025-08-06 14:09:33 +01:00
parent 64a4f3110a
commit 14cb1fba91
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test-cgroup.c
+6 -4
View File
@@ -51,10 +51,12 @@ TEST(cg_create) {
_cleanup_free_ char *here = NULL;
ASSERT_OK(cg_pid_get_path_shifted(0, NULL, &here));
_cleanup_free_ char *test_a = ASSERT_NOT_NULL(path_join(here, "/test-a")),
*test_b = ASSERT_NOT_NULL(path_join(here, "/test-b")),
*test_c = ASSERT_NOT_NULL(path_join(here, "/test-b/test-c")),
*test_d = ASSERT_NOT_NULL(path_join(here, "/test-b/test-d"));
/* cg_* will use path_simplify(), so use it here too otherwise when running in a container at the
* root it asserts with "/test-b != //test-b" */
_cleanup_free_ char *test_a = ASSERT_NOT_NULL(path_simplify(path_join(here, "/test-a"))),
*test_b = ASSERT_NOT_NULL(path_simplify(path_join(here, "/test-b"))),
*test_c = ASSERT_NOT_NULL(path_simplify(path_join(here, "/test-b/test-c"))),
*test_d = ASSERT_NOT_NULL(path_simplify(path_join(here, "/test-b/test-d")));
char *path;
log_info("Paths for test:\n%s\n%s", test_a, test_b);