diff options
Diffstat (limited to 'src/test/test-bus-util.c')
| -rw-r--r-- | src/test/test-bus-util.c | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/src/test/test-bus-util.c b/src/test/test-bus-util.c index 791b3928fe..a536608ce0 100644 --- a/src/test/test-bus-util.c +++ b/src/test/test-bus-util.c @@ -2,38 +2,7 @@ #include "bus-util.h" #include "log.h" - -static void test_name_async(unsigned n_messages) { - _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; - int r; - unsigned i; - - log_info("/* %s (%u) */", __func__, n_messages); - - r = bus_open_system_watch_bind_with_description(&bus, "test-bus"); - if (r < 0) { - log_error_errno(r, "Failed to connect to bus: %m"); - return; - } - - r = bus_request_name_async_may_reload_dbus(bus, NULL, "org.freedesktop.systemd.test-bus-util", 0, NULL); - if (r < 0) { - log_error_errno(r, "Failed to request name: %m"); - return; - } - - for (i = 0; i < n_messages; i++) { - r = sd_bus_process(bus, NULL); - log_debug("stage %u: sd_bus_process returned %d", i, r); - if (r < 0) { - log_notice_errno(r, "Processing failed: %m"); - return; - } - - if (r > 0 && i + 1 < n_messages) - (void) sd_bus_wait(bus, USEC_PER_SEC / 3); - } -} +#include "tests.h" static int callback(sd_bus_message *m, void *userdata, sd_bus_error *ret_error) { return 1; @@ -78,12 +47,8 @@ static void test_destroy_callback(void) { } int main(int argc, char **argv) { - log_set_max_level(LOG_DEBUG); - log_parse_environment(); - log_open(); + test_setup_logging(LOG_DEBUG); - test_name_async(0); - test_name_async(20); test_destroy_callback(); return 0; |