diff options
Diffstat (limited to 'src/libsystemd/sd-bus/test-bus-cleanup.c')
-rw-r--r-- | src/libsystemd/sd-bus/test-bus-cleanup.c | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/src/libsystemd/sd-bus/test-bus-cleanup.c b/src/libsystemd/sd-bus/test-bus-cleanup.c index d1d962ebb2..bea722ba06 100644 --- a/src/libsystemd/sd-bus/test-bus-cleanup.c +++ b/src/libsystemd/sd-bus/test-bus-cleanup.c @@ -8,6 +8,9 @@ #include "bus-message.h" #include "bus-util.h" #include "refcnt.h" +#include "tests.h" + +static bool use_system_bus = false; static void test_bus_new(void) { _cleanup_(sd_bus_unrefp) sd_bus *bus = NULL; @@ -21,8 +24,12 @@ static int test_bus_open(void) { int r; r = sd_bus_open_user(&bus); - if (IN_SET(r, -ECONNREFUSED, -ENOENT)) - return r; + if (IN_SET(r, -ECONNREFUSED, -ENOENT)) { + r = sd_bus_open_system(&bus); + if (IN_SET(r, -ECONNREFUSED, -ENOENT)) + return r; + use_system_bus = true; + } assert_se(r >= 0); printf("after open: refcount %u\n", REFCNT_GET(bus->n_ref)); @@ -34,7 +41,7 @@ static void test_bus_new_method_call(void) { sd_bus *bus = NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; - assert_se(sd_bus_open_user(&bus) >= 0); + assert_se(use_system_bus ? sd_bus_open_system(&bus) >= 0 : sd_bus_open_user(&bus) >= 0); assert_se(sd_bus_message_new_method_call(bus, &m, "a.service.name", "/an/object/path", "an.interface.name", "AMethodName") >= 0); @@ -48,7 +55,7 @@ static void test_bus_new_signal(void) { sd_bus *bus = NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL; - assert_se(sd_bus_open_user(&bus) >= 0); + assert_se(use_system_bus ? sd_bus_open_system(&bus) >= 0 : sd_bus_open_user(&bus) >= 0); assert_se(sd_bus_message_new_signal(bus, &m, "/an/object/path", "an.interface.name", "Name") >= 0); @@ -59,17 +66,12 @@ static void test_bus_new_signal(void) { } int main(int argc, char **argv) { - int r; - - log_parse_environment(); - log_open(); + test_setup_logging(LOG_INFO); test_bus_new(); - r = test_bus_open(); - if (r < 0) { - log_info("Failed to connect to bus, skipping tests."); - return EXIT_TEST_SKIP; - } + + if (test_bus_open() < 0) + return log_tests_skipped("Failed to connect to bus"); test_bus_new_method_call(); test_bus_new_signal(); |