diff options
| author | Sjoerd Simons <sjoerd@luon.net> | 2011-10-16 10:57:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-10-18 12:47:49 +0100 |
| commit | 5043ca30ea9e355ca7bd8758425afb064c81d038 (patch) | |
| tree | 0a1ca0cb544fbe5846297ac4092a1103395616f1 | |
| parent | 6d57a45234daa51d837695a9325c1b71cae101cf (diff) | |
GDBusConnection: Fix race in /gdbus/connection/life-cycle
GDBusConnection sets the closed flag in the worker thread, then adds an
idle callback (which refs the Connection) to signal this in the main
thread. The tests session_bus_down doesn't spin the mainloop, so the
"closed" signal will always fire if iterating the mainloop later (and
drops the ref when doing so). But _is_closed can return TRUE even before
signalling this, in which case the "closed" signal isn't fired and the
ref isn't dropped, causing the test to fail.
Instead simply always wait for the closed signal, which is a good thing
to check anyway and ensures the ref is closed.
Bug: https://bugzilla.gnome.org/show_bug.cgi?id=661896
Reviewed-by: Matthias Clasen <mclasen@redhat.com>
| -rw-r--r-- | gio/tests/gdbus-connection.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gio/tests/gdbus-connection.c b/gio/tests/gdbus-connection.c index a88df900f..073ff9edd 100644 --- a/gio/tests/gdbus-connection.c +++ b/gio/tests/gdbus-connection.c @@ -264,8 +264,7 @@ test_connection_life_cycle (void) g_assert (!g_dbus_connection_is_closed (c)); g_dbus_connection_set_exit_on_close (c, FALSE); session_bus_down (); - if (!g_dbus_connection_is_closed (c)) - _g_assert_signal_received (c, "closed"); + _g_assert_signal_received (c, "closed"); g_assert (g_dbus_connection_is_closed (c)); _g_object_wait_for_single_ref (c); |