From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Wed, 21 Oct 2020 08:07:23 +0000 (+0200)
Subject: test-path: relax test in "ci" and "release" modes
X-Git-Tag: v247-rc1~21^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F16632%2Fhead;p=thirdparty%2Fsystemd.git

test-path: relax test in "ci" and "release" modes
---

diff --git a/src/test/test-path.c b/src/test/test-path.c
index 60f7672a39b..2e20674c2f3 100644
--- a/src/test/test-path.c
+++ b/src/test/test-path.c
@@ -103,10 +103,11 @@ static int _check_states(unsigned line,
                          service_result_to_string(service->result));
 
                 if (service->state == SERVICE_FAILED &&
-                    service->main_exec_status.status == EXIT_CGROUP)
+                    service->main_exec_status.status == EXIT_CGROUP &&
+                    !ci_environment())
                         /* On a general purpose system we may fail to start the service for reasons which are
                          * not under our control: permission limits, resource exhaustion, etc. Let's skip the
-                         * test in those cases. */
+                         * test in those cases. On developer machines we require proper setup. */
                         return log_notice_errno(SYNTHETIC_ERRNO(ECANCELED),
                                                 "Failed to start service %s, aborting test: %s/%s",
                                                 UNIT(service)->id,