]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-condition: drop cgroup version check
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 14 Apr 2025 11:33:08 +0000 (20:33 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 14 Apr 2025 16:22:46 +0000 (17:22 +0100)
After f74ca66e6833c340a1532578176e55cb494590d0, we do not check the
cgroup version of the runtime environment, and unconditionally returns 0
for "v1", and 1 for "v2".

src/test/test-condition.c

index b02f4cce6dae48e03077732fe798a87d251783f5..98418d7ac3531570ad7d98c88eabcb318e333cdd 100644 (file)
@@ -121,19 +121,13 @@ TEST(condition_test_path) {
 
 TEST(condition_test_control_group_hierarchy) {
         Condition *condition;
-        int r;
-
-        r = cg_unified();
-        if (IN_SET(r, -ENOMEDIUM, -ENOENT))
-                return (void) log_tests_skipped("cgroupfs is not mounted");
-        ASSERT_OK(r);
 
-        ASSERT_NOT_NULL((condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, "v1", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ),  r < CGROUP_UNIFIED_ALL);
+        ASSERT_NOT_NULL(condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, "v1", false, false));
+        ASSERT_OK_ZERO(condition_test(condition, environ));
         condition_free(condition);
 
-        ASSERT_NOT_NULL((condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, "v2", false, false)));
-        ASSERT_OK_EQ(condition_test(condition, environ), r >= CGROUP_UNIFIED_ALL);
+        ASSERT_NOT_NULL(condition = condition_new(CONDITION_CONTROL_GROUP_CONTROLLER, "v2", false, false));
+        ASSERT_OK_POSITIVE(condition_test(condition, environ));
         condition_free(condition);
 }