From 6d203bd830de999de48858da069b644f8a8d0938 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 14 Apr 2025 20:33:08 +0900 Subject: [PATCH] test-condition: drop cgroup version check 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 | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/src/test/test-condition.c b/src/test/test-condition.c index b02f4cce6d..98418d7ac3 100644 --- a/src/test/test-condition.c +++ b/src/test/test-condition.c @@ -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); }