File 0002-tests-skip-tests-when-cg_pid_get_path-fail... of Package systemd

Overview Repositories Revisions Requests Users Attributes Meta

File 0002-tests-skip-tests-when-cg_pid_get_path-fails-7033.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Currently displaying revision a47769d8fb254159c07462a5675e1695 , Show latest

From 5c59f35e6984fbabb1b5db2fd5feed6339fbff04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 10 Oct 2017 20:55:20 +0200
Subject: [PATCH 02/11] tests: skip tests when cg_pid_get_path fails (#7033)

v2:
- cast the fstype_t type to ull, because it varies between arches.
  Making it long long should be on the safe side.

(cherry picked from commit 651d47d14b987883c604468e87e0e1871554d213)

[fbui: adjust context
       Conflicts:
         src/test/test-unit-name.c]
---
 src/basic/cgroup-util.c     |  5 ++++-
 src/test/test-bpf.c         |  7 ++++++-
 src/test/test-cgroup-mask.c |  6 +++++-
 src/test/test-engine.c      |  6 +++++-
 src/test/test-execute.c     |  8 ++++++--
 src/test/test-helper.c      | 17 +++++++++++------
 src/test/test-helper.h      |  2 +-
 src/test/test-path.c        |  6 +++++-
 src/test/test-sched-prio.c  |  6 +++++-
 src/test/test-unit-file.c   |  6 +++++-
 src/test/test-unit-name.c   |  8 ++++++--
 11 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 70e8243f14..3eb1b37abe 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2437,8 +2437,11 @@ static int cg_unified_update(void) {
                                 return -ENOMEDIUM;
                         unified_cache = CGROUP_UNIFIED_NONE;
                 }
-        } else
+        } else {
+                log_debug("Unknown filesystem type %llx mounted on /sys/fs/cgroup.",
+                          (unsigned long long) fs.f_type);
                 return -ENOMEDIUM;
+        }
 
         return 0;
 }
diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c
index 58181367a9..7b75f5a99a 100644
--- a/src/test/test-bpf.c
+++ b/src/test/test-bpf.c
@@ -49,7 +49,12 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice("cgroupfs not available, skipping tests");
+                return EXIT_TEST_SKIP;
+        }
+
         assert_se(set_unit_path(get_testdata_dir("")) >= 0);
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c
index 5262ca2549..dee42a6ff3 100644
--- a/src/test/test-cgroup-mask.c
+++ b/src/test/test-cgroup-mask.c
@@ -35,7 +35,11 @@ static int test_cgroup_mask(void) {
         FDSet *fdset = NULL;
         int r;
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                puts("Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         /* Prepare the manager. */
         assert_se(set_unit_path(get_testdata_dir("")) >= 0);
diff --git a/src/test/test-engine.c b/src/test/test-engine.c
index b5d3da0d38..06e15acc43 100644
--- a/src/test/test-engine.c
+++ b/src/test/test-engine.c
@@ -37,7 +37,11 @@ int main(int argc, char *argv[]) {
         Job *j;
         int r;
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         /* prepare the test */
         assert_se(set_unit_path(get_testdata_dir("")) >= 0);
diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index ac2cdd50ed..d33054eab4 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -522,11 +522,15 @@ int main(int argc, char *argv[]) {
 
         /* It is needed otherwise cgroup creation fails */
         if (getuid() != 0) {
-                printf("Skipping test: not root\n");
+                puts("Skipping test: not root");
                 return EXIT_TEST_SKIP;
         }
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                puts("Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         assert_se(setenv("XDG_RUNTIME_DIR", "/tmp/", 1) == 0);
         assert_se(set_unit_path(get_testdata_dir("/test-execute")) >= 0);
diff --git a/src/test/test-helper.c b/src/test/test-helper.c
index 5b707c3276..2a4b4347b6 100644
--- a/src/test/test-helper.c
+++ b/src/test/test-helper.c
@@ -22,20 +22,25 @@
 #include "alloc-util.h"
 #include "cgroup-util.h"
 
-void enter_cgroup_subroot(void) {
+int enter_cgroup_subroot(void) {
         _cleanup_free_ char *cgroup_root = NULL, *cgroup_subroot = NULL;
         CGroupMask supported;
+        int r;
+
+        r = cg_pid_get_path(NULL, 0, &cgroup_root);
+        if (r == -ENOMEDIUM)
+                return log_warning_errno(r, "cg_pid_get_path(NULL, 0, ...) failed: %m");
+        assert(r >= 0);
 
-        assert_se(cg_pid_get_path(NULL, 0, &cgroup_root) >= 0);
         assert_se(asprintf(&cgroup_subroot, "%s/%" PRIx64, cgroup_root, random_u64()) >= 0);
         assert_se(cg_mask_supported(&supported) >= 0);
 
         /* If this fails, then we don't mind as the later cgroup operations will fail too, and it's fine if we handle
          * any errors at that point. */
 
-        if (cg_create_everywhere(supported, _CGROUP_MASK_ALL, cgroup_subroot) < 0)
-                return;
+        r = cg_create_everywhere(supported, _CGROUP_MASK_ALL, cgroup_subroot);
+        if (r < 0)
+                return r;
 
-        if (cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL) < 0)
-                return;
+        return cg_attach_everywhere(supported, cgroup_subroot, 0, NULL, NULL);
 }
diff --git a/src/test/test-helper.h b/src/test/test-helper.h
index 8af32c8744..f7235527a5 100644
--- a/src/test/test-helper.h
+++ b/src/test/test-helper.h
@@ -40,4 +40,4 @@
                -ENOMEDIUM /* cannot determine cgroup */         \
                )
 
-void enter_cgroup_subroot(void);
+int enter_cgroup_subroot(void);
diff --git a/src/test/test-path.c b/src/test/test-path.c
index 6fc3f79d80..476c8cb5a9 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -45,7 +45,11 @@ static int setup_test(Manager **m) {
 
         assert_se(m);
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         r = manager_new(UNIT_FILE_USER, true, &tmp);
         if (MANAGER_SKIP_TEST(r)) {
diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 062a02baf5..eb8ac55fde 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -34,7 +34,11 @@ int main(int argc, char *argv[]) {
         FDSet *fdset = NULL;
         int r;
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         /* prepare the test */
         assert_se(set_unit_path(get_testdata_dir("")) >= 0);
diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c
index d0c844dddb..3971a49f95 100644
--- a/src/test/test-unit-file.c
+++ b/src/test/test-unit-file.c
@@ -848,7 +848,11 @@ int main(int argc, char *argv[]) {
         log_parse_environment();
         log_open();
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         assert_se(runtime_dir = setup_fake_runtime_dir());
 
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 8ef7998fac..fb88cef943 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -463,9 +463,13 @@ static void test_unit_name_path_unescape(void) {
 }
 
 int main(int argc, char* argv[]) {
-        int rc = 0;
+        int r, rc = 0;
 
-        enter_cgroup_subroot();
+        r = enter_cgroup_subroot();
+        if (r == -ENOMEDIUM) {
+                log_notice_errno(r, "Skipping test: cgroupfs not available");
+                return EXIT_TEST_SKIP;
+        }
 
         test_unit_name_is_valid();
         test_unit_name_replace_instance();
-- 
2.16.4

Places

File 0002-tests-skip-tests-when-cg_pid_get_path-fails-7033.patch of Package systemd (Revision a47769d8fb254159c07462a5675e1695)

Places