[next] telepathy-glib: Fix racy test-self-handle

[Simon McVittie]

Module: telepathy-glib
Branch: next
Commit: 2c5d83a54c2c06cb99e1f21985945392e3d937c8
URL:    http://cgit.freedesktop.org/telepathy/telepathy-glib/commit/?id=2c5d83a54c2c06cb99e1f21985945392e3d937c8

Author: Xavier Claessens <xavier.claessens at collabora.com>
Date:   Wed May 14 10:13:32 2014 -0400

Fix racy test-self-handle

Hopefully this time it won't randomly break anymore.

https://bugs.freedesktop.org/show_bug.cgi?id=78593

---

 tests/dbus/self-handle.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/dbus/self-handle.c b/tests/dbus/self-handle.c
index 4a9d481..2059e8f 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,