From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 14 Sep 2018 06:47:42 +0000 (+0900)
Subject: test-execute: skip several tests when running in container
X-Git-Tag: v240~661^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=642d1a6d6e98204ade25816bcc429cb67df92a29;p=thirdparty%2Fsystemd.git

test-execute: skip several tests when running in container
---

diff --git a/src/test/test-execute.c b/src/test/test-execute.c
index 80b60d03178..ade02b1e3c1 100644
--- a/src/test/test-execute.c
+++ b/src/test/test-execute.c
@@ -640,14 +640,24 @@ static void test_exec_privatenetwork(Manager *m) {
 
 static void test_exec_oomscoreadjust(Manager *m) {
         test(m, "exec-oomscoreadjust-positive.service", 0, CLD_EXITED);
+
+        if (detect_container() > 0) {
+                log_notice("Testing in container, skipping remaining tests in %s", __func__);
+                return;
+        }
         test(m, "exec-oomscoreadjust-negative.service", 0, CLD_EXITED);
 }
 
 static void test_exec_ioschedulingclass(Manager *m) {
         test(m, "exec-ioschedulingclass-none.service", 0, CLD_EXITED);
         test(m, "exec-ioschedulingclass-idle.service", 0, CLD_EXITED);
-        test(m, "exec-ioschedulingclass-realtime.service", 0, CLD_EXITED);
         test(m, "exec-ioschedulingclass-best-effort.service", 0, CLD_EXITED);
+
+        if (detect_container() > 0) {
+                log_notice("Testing in container, skipping remaining tests in %s", __func__);
+                return;
+        }
+        test(m, "exec-ioschedulingclass-realtime.service", 0, CLD_EXITED);
 }
 
 static void test_exec_unsetenvironment(Manager *m) {