From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 17 Oct 2023 12:31:11 +0000 (+0200)
Subject: test-cgroup: make test case a bit more robust towards previous aborted runs
X-Git-Tag: v255-rc1~209^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d0547385d9da980ca752e1f5df959280a053fdb4;p=thirdparty%2Fsystemd.git

test-cgroup: make test case a bit more robust towards previous aborted runs
---

diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c
index c6e6b8e01a9..0fbd6351a4a 100644
--- a/src/test/test-cgroup.c
+++ b/src/test/test-cgroup.c
@@ -61,6 +61,10 @@ TEST(cg_create) {
 
         log_info("Paths for test:\n%s\n%s", test_a, test_b);
 
+        /* Possibly clean up left-overs from aboted previous runs */
+        (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_a, /* delete_root= */ true);
+        (void) cg_trim(SYSTEMD_CGROUP_CONTROLLER, test_b, /* delete_root= */ true);
+
         r = cg_create(SYSTEMD_CGROUP_CONTROLLER, test_a);
         if (IN_SET(r, -EPERM, -EACCES, -EROFS)) {
                 log_info_errno(r, "Skipping %s: %m", __func__);