From 67c6ff720796bc97f262ba93c6ea87da93b04a1a Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Fri, 31 Jul 2020 10:36:57 +0200

Subject: [PATCH 3/4] test-path: do not fail the test if we fail to start some

 service

The test was failing because it couldn't start the service:

path-modified.service: state = failed; result = exit-code

path-modified.path: state = waiting; result = success

path-modified.service: state = failed; result = exit-code

path-modified.path: state = waiting; result = success

path-modified.service: state = failed; result = exit-code

path-modified.path: state = waiting; result = success

path-modified.service: state = failed; result = exit-code

path-modified.path: state = waiting; result = success

path-modified.service: state = failed; result = exit-code

path-modified.path: state = waiting; result = success

path-modified.service: state = failed; result = exit-code

Failed to connect to system bus: No such file or directory

-.slice: Failed to enable/disable controllers on cgroup /system.slice/kojid.service, ignoring: Permission denied

path-modified.service: Failed to create cgroup /system.slice/kojid.service/path-modified.service: Permission denied

path-modified.service: Failed to attach to cgroup /system.slice/kojid.service/path-modified.service: No such file or directory

path-modified.service: Failed at step CGROUP spawning /bin/true: No such file or directory

path-modified.service: Main process exited, code=exited, status=219/CGROUP

path-modified.service: Failed with result 'exit-code'.

Test timeout when testing path-modified.path

In fact any of the services that we try to start may fail, especially

considering that we're doing some rogue cgroup operations. See

https://github.com/systemd/systemd/pull/16603#issuecomment-679133641.

---

 src/test/test-path.c | 88 ++++++++++++++++++++++++++++++--------------

 1 file changed, 61 insertions(+), 27 deletions(-)

diff --git a/src/test/test-path.c b/src/test/test-path.c

index 84dcf5e37d..d6c37b77e6 100644

--- a/src/test/test-path.c

+++ b/src/test/test-path.c

@@ -77,8 +77,8 @@ static Service *service_for_path(Manager *m, Path *path, const char *service_nam

         return SERVICE(service_unit);

 }

-static void _check_states(unsigned line,

-                          Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) {

+static int _check_states(unsigned line,

+                         Manager *m, Path *path, Service *service, PathState path_state, ServiceState service_state) {

         assert_se(m);

         assert_se(service);

@@ -102,11 +102,20 @@ static void _check_states(unsigned line,

                          service_state_to_string(service->state),

                          service_result_to_string(service->result));

+                if (service->state == SERVICE_FAILED)

+                        return log_notice_errno(SYNTHETIC_ERRNO(ECANCELED),

+                                                "Failed to start service %s, aborting test: %s/%s",

+                                                UNIT(service)->id,

+                                                service_state_to_string(service->state),

+                                                service_result_to_string(service->result));

+

                 if (n >= end) {

                         log_error("Test timeout when testing %s", UNIT(path)->id);

                         exit(EXIT_FAILURE);

                 }

         }

+

+        return 0;

 }

 #define check_states(...) _check_states(__LINE__, __VA_ARGS__)

@@ -124,18 +133,22 @@ static void test_path_exists(Manager *m) {

         service = service_for_path(m, path, NULL);

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(touch(test_path) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         /* Service restarts if file still exists */

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(unit_stop(unit) >= 0);

 }

@@ -154,18 +167,22 @@ static void test_path_existsglob(Manager *m) {

         service = service_for_path(m, path, NULL);

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(touch(test_path) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         /* Service restarts if file still exists */

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(unit_stop(unit) >= 0);

 }

@@ -185,23 +202,28 @@ static void test_path_changed(Manager *m) {

         service = service_for_path(m, path, NULL);

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(touch(test_path) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         /* Service does not restart if file still exists */

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         f = fopen(test_path, "w");

         assert_se(f);

         fclose(f);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL);

         assert_se(unit_stop(unit) >= 0);

@@ -222,23 +244,28 @@ static void test_path_modified(Manager *m) {

         service = service_for_path(m, path, NULL);

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(touch(test_path) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         /* Service does not restart if file still exists */

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         f = fopen(test_path, "w");

         assert_se(f);

         fputs("test", f);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         (void) rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL);

         assert_se(unit_stop(unit) >= 0);

@@ -258,14 +285,17 @@ static void test_path_unit(Manager *m) {

         service = service_for_path(m, path, "path-mycustomunit.service");

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(touch(test_path) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(unit_stop(unit) >= 0);

 }

@@ -286,22 +316,26 @@ static void test_path_directorynotempty(Manager *m) {

         assert_se(access(test_path, F_OK) < 0);

         assert_se(unit_start(unit) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         /* MakeDirectory default to no */

         assert_se(access(test_path, F_OK) < 0);

         assert_se(mkdir_p(test_path, 0755) >= 0);

         assert_se(touch(strjoina(test_path, "test_file")) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         /* Service restarts if directory is still not empty */

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING);

+        if (check_states(m, path, service, PATH_RUNNING, SERVICE_RUNNING) < 0)

+                return;

         assert_se(rm_rf(test_path, REMOVE_ROOT|REMOVE_PHYSICAL) == 0);

         assert_se(unit_stop(UNIT(service)) >= 0);

-        check_states(m, path, service, PATH_WAITING, SERVICE_DEAD);

+        if (check_states(m, path, service, PATH_WAITING, SERVICE_DEAD) < 0)

+                return;

         assert_se(unit_stop(unit) >= 0);

 }