34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
|
From 62e20ce3dc0210e331147b717ea36b17a3d555f2 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Tue, 6 Mar 2018 00:01:36 +0100
|
||
|
|
Subject: [PATCH] test-cgroup-util: bail out when running under mock
|
||
|
|
|
||
|
|
The builds were failing in Fedora koji, where something strange is mounted
|
||
|
|
on /sys/fs/cgroup.
|
||
|
|
---
|
||
|
|
src/test/test-cgroup-util.c | 10 ++++++++--
|
||
|
|
1 file changed, 8 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c
|
||
|
|
index c4163fc3a9..9ef7c97c74 100644
|
||
|
|
--- a/src/test/test-cgroup-util.c
|
||
|
|
+++ b/src/test/test-cgroup-util.c
|
||
|
|
@@ -408,9 +408,15 @@ static void test_cg_tests(void) {
|
||
|
|
static void test_cg_get_keyed_attribute(void) {
|
||
|
|
_cleanup_free_ char *val = NULL;
|
||
|
|
char *vals3[3] = {}, *vals3a[3] = {};
|
||
|
|
- int i;
|
||
|
|
+ int i, r;
|
||
|
|
|
||
|
|
- assert_se(cg_get_keyed_attribute("cpu", "/init.scope", "no_such_file", STRV_MAKE("no_such_attr"), &val) == -ENOENT);
|
||
|
|
+ r = cg_get_keyed_attribute("cpu", "/init.scope", "no_such_file", STRV_MAKE("no_such_attr"), &val);
|
||
|
|
+ if (r == -ENOMEDIUM) {
|
||
|
|
+ log_info_errno(r, "Skipping most of %s, /sys/fs/cgroup not accessible: %m", __func__);
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
+
|
||
|
|
+ assert_se(r == -ENOENT);
|
||
|
|
assert_se(val == NULL);
|
||
|
|
|
||
|
|
if (access("/sys/fs/cgroup/init.scope/cpu.stat", R_OK) < 0) {
|