diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-11-27 19:26:03 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-12-04 11:52:52 +0000 |
| commit | f59b4f9226c0134f91fc1eefebef6e7a816f85cd (patch) | |
| tree | beda5c6503d7bb010ee42abf15ea9a23466140a8 /test/test-utils.h | |
| parent | 38ff6bd20d58b57a5dd0eab1b1c09c5c43b61d26 (diff) | |
| download | dbus-f59b4f9226c0134f91fc1eefebef6e7a816f85cd.tar.gz | |
test-utils: Separate failable and non-failable functions
test_object_try_whatever() now has libdbus-like OOM handling,
while test_object_whatever() has GLib-like OOM handling. This is
because an overwhelming majority of the callers of these functions
either didn't check for OOM anyway, or checked for it but then
aborted. In the uncommon case where we do care, we can use the _try_
version.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=100317
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'test/test-utils.h')
| -rw-r--r-- | test/test-utils.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/test/test-utils.h b/test/test-utils.h index 39fae77b..860ee216 100644 --- a/test/test-utils.h +++ b/test/test-utils.h @@ -10,18 +10,27 @@ #include <dbus/dbus-internals.h> typedef DBusLoop TestMainContext; +_DBUS_GNUC_WARN_UNUSED_RESULT TestMainContext *test_main_context_get (void); +_DBUS_GNUC_WARN_UNUSED_RESULT +TestMainContext *test_main_context_try_get (void); TestMainContext *test_main_context_ref (TestMainContext *ctx); void test_main_context_unref (TestMainContext *ctx); void test_main_context_iterate (TestMainContext *ctx, dbus_bool_t may_block); -dbus_bool_t test_connection_setup (TestMainContext *ctx, +_DBUS_GNUC_WARN_UNUSED_RESULT +dbus_bool_t test_connection_try_setup (TestMainContext *ctx, + DBusConnection *connection); +void test_connection_setup (TestMainContext *ctx, DBusConnection *connection); void test_connection_shutdown (TestMainContext *ctx, DBusConnection *connection); -dbus_bool_t test_server_setup (TestMainContext *ctx, +_DBUS_GNUC_WARN_UNUSED_RESULT +dbus_bool_t test_server_try_setup (TestMainContext *ctx, + DBusServer *server); +void test_server_setup (TestMainContext *ctx, DBusServer *server); void test_server_shutdown (TestMainContext *ctx, DBusServer *server); |