summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Claessens <xavier.claessens@collabora.com>2014-05-14 10:13:32 -0400
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2014-09-17 14:18:05 +0100
commit2c5d83a54c2c06cb99e1f21985945392e3d937c8 (patch)
tree1856b10daffea723384de3a67821f1e5f2797c93
parent654962f11dd1d89f96ad4a0f47dff8cbab2f45bf (diff)
downloadtelepathy-glib-2c5d83a54c2c06cb99e1f21985945392e3d937c8.tar.gz
Fix racy test-self-handle
Hopefully this time it won't randomly break anymore. https://bugs.freedesktop.org/show_bug.cgi?id=78593
-rw-r--r--tests/dbus/self-handle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/dbus/self-handle.c b/tests/dbus/self-handle.c
index 4a9d48151..2059e8fe3 100644
--- a/tests/dbus/self-handle.c
+++ b/tests/dbus/self-handle.c
@@ -283,6 +283,10 @@ test_change_inconveniently (Fixture *f,
* and the self-ID at the same time. */
g_assert_cmpstr (arg, ==, "round-trip");
+ /* TpConnection::constructed does an initial GetAll. We don't want that call
+ * to interfer with our test, so let's wait for the dust to settle first. */
+ tp_tests_proxy_run_until_prepared (f->client_conn, NULL);
+
g_signal_connect_swapped (f->client_conn, "notify::self-contact",
G_CALLBACK (swapped_counter_cb), &contact_times);
filter_id = g_dbus_connection_add_filter (f->dbus,