diff options
Diffstat (limited to 'bus')
-rw-r--r-- | bus/dispatch.c | 15 | ||||
-rw-r--r-- | bus/loop.h | 2 | ||||
-rw-r--r-- | bus/test.c | 94 | ||||
-rw-r--r-- | bus/test.h | 2 |
4 files changed, 106 insertions, 7 deletions
diff --git a/bus/dispatch.c b/bus/dispatch.c index 928e4387..35ea5549 100644 --- a/bus/dispatch.c +++ b/bus/dispatch.c @@ -379,7 +379,7 @@ bus_dispatch_remove_connection (DBusConnection *connection) static void flush_bus (BusContext *context) -{ +{ while (bus_loop_iterate (FALSE)) ; } @@ -435,23 +435,28 @@ bus_dispatch_test (const DBusString *test_data_dir) DBusResultCode result; dbus_error_init (&error); - context = bus_context_new ("debug:name=test-server", + context = bus_context_new ("debug-pipe:name=test-server", activation_dirs, &error); if (context == NULL) _dbus_assert_not_reached ("could not alloc context"); - foo = dbus_connection_open ("debug:name=test-server", &result); + foo = dbus_connection_open ("debug-pipe:name=test-server", &result); if (foo == NULL) _dbus_assert_not_reached ("could not alloc connection"); - bar = dbus_connection_open ("debug:name=test-server", &result); + bar = dbus_connection_open ("debug-pipe:name=test-server", &result); if (bar == NULL) _dbus_assert_not_reached ("could not alloc connection"); - baz = dbus_connection_open ("debug:name=test-server", &result); + baz = dbus_connection_open ("debug-pipe:name=test-server", &result); if (baz == NULL) _dbus_assert_not_reached ("could not alloc connection"); + + if (!bus_setup_debug_client (foo) || + !bus_setup_debug_client (bar) || + !bus_setup_debug_client (baz)) + _dbus_assert_not_reached ("could not set up connection"); if (!check_hello_message (context, foo)) _dbus_assert_not_reached ("hello message failed"); @@ -50,6 +50,4 @@ void bus_loop_run (void); void bus_loop_quit (void); dbus_bool_t bus_loop_iterate (dbus_bool_t block); - - #endif /* BUS_LOOP_H */ @@ -21,3 +21,97 @@ * */ +#include <config.h> + +#ifdef DBUS_BUILD_TESTS +#include "test.h" +#include "loop.h" + +/* The "debug client" watch/timeout handlers don't dispatch messages, + * as we manually pull them in order to verify them. This is why they + * are different from the real handlers in connection.c + */ + +static void +connection_watch_callback (DBusWatch *watch, + unsigned int condition, + void *data) +{ + DBusConnection *connection = data; + + dbus_connection_ref (connection); + + dbus_connection_handle_watch (connection, watch, condition); + + dbus_connection_unref (connection); +} + +static dbus_bool_t +add_connection_watch (DBusWatch *watch, + DBusConnection *connection) +{ + return bus_loop_add_watch (watch, connection_watch_callback, connection, + NULL); +} + +static void +remove_connection_watch (DBusWatch *watch, + DBusConnection *connection) +{ + bus_loop_remove_watch (watch, connection_watch_callback, connection); +} + +static void +connection_timeout_callback (DBusTimeout *timeout, + void *data) +{ + DBusConnection *connection = data; + + dbus_connection_ref (connection); + + dbus_timeout_handle (timeout); + + dbus_connection_unref (connection); +} + +static dbus_bool_t +add_connection_timeout (DBusTimeout *timeout, + DBusConnection *connection) +{ + return bus_loop_add_timeout (timeout, connection_timeout_callback, connection, NULL); +} + +static void +remove_connection_timeout (DBusTimeout *timeout, + DBusConnection *connection) +{ + bus_loop_remove_timeout (timeout, connection_timeout_callback, connection); +} + + +dbus_bool_t +bus_setup_debug_client (DBusConnection *connection) +{ + + if (!dbus_connection_set_watch_functions (connection, + (DBusAddWatchFunction) add_connection_watch, + (DBusRemoveWatchFunction) remove_connection_watch, + connection, + NULL)) + { + dbus_connection_disconnect (connection); + return FALSE; + } + + if (!dbus_connection_set_timeout_functions (connection, + (DBusAddTimeoutFunction) add_connection_timeout, + (DBusRemoveTimeoutFunction) remove_connection_timeout, + connection, NULL)) + { + dbus_connection_disconnect (connection); + return FALSE; + } + + return TRUE; +} +#endif @@ -33,6 +33,8 @@ dbus_bool_t bus_dispatch_test (const DBusString *test_data_dir); +dbus_bool_t bus_setup_debug_client (DBusConnection *connection); + #endif #endif /* BUS_TEST_H */ |