[telepathy-gabble/master] test-save-alias-to-roster.py: fix a race

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Fri Jul 3 03:22:49 PDT 2009


---
 tests/twisted/roster/test-save-alias-to-roster.py |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/roster/test-save-alias-to-roster.py b/tests/twisted/roster/test-save-alias-to-roster.py
index 853e7ad..5a7bf3b 100644
--- a/tests/twisted/roster/test-save-alias-to-roster.py
+++ b/tests/twisted/roster/test-save-alias-to-roster.py
@@ -60,14 +60,15 @@ def test(q, bus, conn, stream):
         content='Bobby')
     stream.send(result)
 
-    event = q.expect('stream-iq', iq_type='set', query_ns=ns.ROSTER)
+    event, _ = q.expect_many(
+        EventPattern('stream-iq', iq_type='set', query_ns=ns.ROSTER),
+        EventPattern('dbus-return', method='RequestAliases',
+        value=(['Bobby'],)))
+
     item = event.query.firstChildElement()
     assert item['jid'] == 'bob at foo.com'
     assert item['name'] == 'Bobby'
 
-    q.expect('dbus-return', method='RequestAliases',
-        value=(['Bobby'],))
-
     conn.Disconnect()
 
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
-- 
1.5.6.5




More information about the telepathy-commits mailing list