From 7e250f703094d2931b3a2869e66bdbfd0585dbf9 Mon Sep 17 00:00:00 2001
From: Daan De Meyer <daan@amutable.com>
Date: Sun, 24 May 2026 13:12:20 +0000
Subject: [PATCH] test-pressure: Skip if controller didn't get enabled

If for any reason the controller didn't get enabled on the
scope, skip the test.
---
 src/test/test-pressure.c | 41 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/test/test-pressure.c b/src/test/test-pressure.c
index 318b73e4fd6..6bdae6c19bd 100644
--- a/src/test/test-pressure.c
+++ b/src/test/test-pressure.c
@@ -10,8 +10,10 @@
 #include "sd-bus.h"
 #include "sd-event.h"
 
+#include "bus-error.h"
 #include "bus-locator.h"
 #include "bus-wait-for-jobs.h"
+#include "cgroup-util.h"
 #include "event-util.h"
 #include "fd-util.h"
 #include "format-util.h"
@@ -164,6 +166,27 @@ TEST(fake_io_pressure) {
 
 /* Shared infrastructure for real pressure tests */
 
+static int controller_supported_on_unit(sd_bus *bus, const char *unit_path, CGroupMask controller) {
+        _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
+        _cleanup_free_ char *cg = NULL;
+        CGroupMask mask;
+        int r;
+
+        r = sd_bus_get_property_string(bus, "org.freedesktop.systemd1", unit_path,
+                                       "org.freedesktop.systemd1.Unit", "ControlGroup", &error, &cg);
+        if (r < 0)
+                return log_notice_errno(r, "Failed to read ControlGroup property: %s", bus_error_message(&error, r));
+
+        if (isempty(cg))
+                return -ENODATA;
+
+        r = cg_mask_supported_subtree(cg, &mask);
+        if (r < 0)
+                return log_notice_errno(r, "Failed to read supported controllers for %s: %m", cg);
+
+        return FLAGS_SET(mask, controller);
+}
+
 struct real_pressure_context {
         sd_event_source *pid;
 };
@@ -267,6 +290,11 @@ TEST(real_memory_pressure) {
 
         ASSERT_OK(bus_wait_for_jobs_one(w, object, /* flags= */ BUS_WAIT_JOBS_LOG_ERROR, /* extra_args= */ NULL));
 
+        _cleanup_free_ char *uo = ASSERT_NOT_NULL(unit_dbus_path_from_name(scope));
+        r = controller_supported_on_unit(bus, uo, CGROUP_MASK_MEMORY);
+        if (r <= 0)
+                return (void) log_tests_skipped("Memory controller not available on scope");
+
         ASSERT_OK(sd_event_default(&e));
 
         ASSERT_OK_ERRNO(pipe2(pipe_fd, O_CLOEXEC));
@@ -304,9 +332,6 @@ TEST(real_memory_pressure) {
         ASSERT_OK_ZERO(sd_event_source_set_memory_pressure_period(es, 70 * USEC_PER_MSEC, 2 * USEC_PER_SEC));
         ASSERT_OK(sd_event_source_set_enabled(es, SD_EVENT_ONESHOT));
 
-        _cleanup_free_ char *uo = NULL;
-        ASSERT_NOT_NULL(uo = unit_dbus_path_from_name(scope));
-
         uint64_t mcurrent = UINT64_MAX;
         ASSERT_OK(sd_bus_get_property_trivial(bus, "org.freedesktop.systemd1", uo, "org.freedesktop.systemd1.Scope", "MemoryCurrent", &error, 't', &mcurrent));
 
@@ -408,6 +433,11 @@ TEST(real_cpu_pressure) {
 
         ASSERT_OK(bus_wait_for_jobs_one(w, object, /* flags= */ BUS_WAIT_JOBS_LOG_ERROR, /* extra_args= */ NULL));
 
+        _cleanup_free_ char *uo = ASSERT_NOT_NULL(unit_dbus_path_from_name(scope));
+        r = controller_supported_on_unit(bus, uo, CGROUP_MASK_CPU);
+        if (r <= 0)
+                return (void) log_tests_skipped("CPU controller not available on scope");
+
         ASSERT_OK(sd_event_default(&e));
 
         ASSERT_OK_ERRNO(pipe2(pipe_fd, O_CLOEXEC));
@@ -537,6 +567,11 @@ TEST(real_io_pressure) {
 
         ASSERT_OK(bus_wait_for_jobs_one(w, object, /* flags= */ BUS_WAIT_JOBS_LOG_ERROR, /* extra_args= */ NULL));
 
+        _cleanup_free_ char *uo = ASSERT_NOT_NULL(unit_dbus_path_from_name(scope));
+        r = controller_supported_on_unit(bus, uo, CGROUP_MASK_IO);
+        if (r <= 0)
+                return (void) log_tests_skipped("IO controller not available on scope");
+
         ASSERT_OK(sd_event_default(&e));
 
         ASSERT_OK_ERRNO(pipe2(pipe_fd, O_CLOEXEC));
-- 
2.47.3