From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 Nov 2013 20:01:24 +0000 (+0100)
Subject: test: exit early if we would conflict with running user systemd
X-Git-Tag: v209~1385
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a454d241ef8b08e0984c6efbbd6187d70e32145b;p=elogind.git

test: exit early if we would conflict with running user systemd
---

diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c
index 1bbe86731..aee75e81c 100644
--- a/src/test/test-sched-prio.c
+++ b/src/test/test-sched-prio.c
@@ -35,7 +35,7 @@ int main(int argc, char *argv[]) {
         /* prepare the test */
         assert_se(set_unit_path(TEST_DIR) >= 0);
         r = manager_new(SYSTEMD_USER, false, &m);
-        if (r == -EPERM || r == -EACCES) {
+        if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) {
                 puts("manager_new: Permission denied. Skipping test.");
                 return EXIT_TEST_SKIP;
         }
diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c
index 67ccdd422..bde643ad5 100644
--- a/src/test/test-unit-name.c
+++ b/src/test/test-unit-name.c
@@ -125,7 +125,7 @@ static int test_unit_printf(void) {
         assert_se(asprintf(&root_uid, "%d", (int) root->pw_uid) > 0);
 
         r = manager_new(SYSTEMD_USER, false, &m);
-        if (r == -EPERM || r == -EACCES) {
+        if (r == -EPERM || r == -EACCES || r == -EADDRINUSE) {
                 puts("manager_new: Permission denied. Skipping test.");
                 return EXIT_TEST_SKIP;
         }