]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test-path: relax test in "ci" and "release" modes 16632/head
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Wed, 21 Oct 2020 08:07:23 +0000 (10:07 +0200)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 22 Oct 2020 11:16:26 +0000 (13:16 +0200)
src/test/test-path.c

index 60f7672a39bda002007635d4e87c52cbbda14340..2e20674c2f39ebaca5489d7950266d2c9e18e9c4 100644 (file)
@@ -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,