[telepathy-gabble/telepathy-gabble-0.8] Fix race in tests/twisted/vcard/test-avatar-multiple-resources.py, as per smcv's review

[Alban Crequy]

---
 .../vcard/test-avatar-multiple-resources.py        |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/vcard/test-avatar-multiple-resources.py b/tests/twisted/vcard/test-avatar-multiple-resources.py
index 62b6044..d39095b 100644
--- a/tests/twisted/vcard/test-avatar-multiple-resources.py
+++ b/tests/twisted/vcard/test-avatar-multiple-resources.py
@@ -46,12 +46,13 @@ def test(q, bus, conn, stream):
     stream.send(make_presence('test at localhost/resource1',
         'SHA1SUM-FOR-MYSELF-RES1'))
     q.forbid_events([AvatarRetrieved_event])
-    event = q.expect('stream-presence')
-    event = q.expect('dbus-signal', signal='AvatarUpdated')
-    assert event.args[0] == 1, event.args
-    assert event.args[1] == "", event.args
-    event = q.expect('stream-iq', to=None, query_ns='vcard-temp',
-            query_name='vCard')
+    stream_presence, avatar_update, stream_iq = q.expect_many(
+        EventPattern('stream-presence'),
+        EventPattern('dbus-signal', signal='AvatarUpdated'),
+        EventPattern('stream-iq', to=None, query_ns='vcard-temp',
+            query_name='vCard'))
+    assert avatar_update.args[0] == 1, avatar_update.args
+    assert avatar_update.args[1] == "", avatar_update.args
     sync_dbus(bus, q, conn)
     q.unforbid_events([AvatarRetrieved_event])
 
-- 
1.5.6.5