luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-14 19:55:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix race in gdbus-connection test

Browse Source 
We need to flush the AddMatches before even connecting to the bus, or we
risk missing the NameOwnerChanged from the new connections.
This commit is contained in:
Alexander Larsson 2012-04-16 10:18:44 +02:00
parent ff92fe9593
commit b77af49b0a
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gio/tests/gdbus-connection.c
View File

@ -619,18 +619,6 @@ test_connection_signals (void)
count_s2 = 0; count_s2 = 0;
count_name_owner_changed = 0; count_name_owner_changed = 0;
/*
* Bring up two other connections
*/
c2 = _g_bus_get_priv (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (c2 != NULL);
g_assert (!g_dbus_connection_is_closed (c2));
g_assert_cmpstr (g_dbus_connection_get_unique_name (c2), ==, ":1.2");
c3 = _g_bus_get_priv (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (c3 != NULL);
g_assert (!g_dbus_connection_is_closed (c3));
g_assert_cmpstr (g_dbus_connection_get_unique_name (c3), ==, ":1.3");
/* /*
* Make c2 emit "Foo" - we should catch it twice * Make c2 emit "Foo" - we should catch it twice
* *
@ -656,6 +644,19 @@ test_connection_signals (void)
g_assert_no_error (error); g_assert_no_error (error);
g_assert (result != NULL); g_assert (result != NULL);
g_variant_unref (result); g_variant_unref (result);
/*
* Bring up two other connections
*/
c2 = _g_bus_get_priv (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (c2 != NULL);
g_assert (!g_dbus_connection_is_closed (c2));
g_assert_cmpstr (g_dbus_connection_get_unique_name (c2), ==, ":1.2");
c3 = _g_bus_get_priv (G_BUS_TYPE_SESSION, NULL, NULL);
g_assert (c3 != NULL);
g_assert (!g_dbus_connection_is_closed (c3));
g_assert_cmpstr (g_dbus_connection_get_unique_name (c3), ==, ":1.3");
/* now, emit the signal on c2 */ /* now, emit the signal on c2 */
ret = g_dbus_connection_emit_signal (c2, ret = g_dbus_connection_emit_signal (c2,
NULL, /* destination bus name */ NULL, /* destination bus name */