[Telepathy-commits] [telepathy-gabble/master] olpc/olpc-muc-invitation.py: avoid a race (stream presence vs AddMembers returning)

[Simon McVittie]

20080721174228-53eee-de320e8ee08ed102e7c228f76090990e051d66dd.gz
---
 tests/twisted/olpc/olpc-muc-invitation.py |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/olpc/olpc-muc-invitation.py b/tests/twisted/olpc/olpc-muc-invitation.py
index 19dd2ba..6435208 100644
--- a/tests/twisted/olpc/olpc-muc-invitation.py
+++ b/tests/twisted/olpc/olpc-muc-invitation.py
@@ -104,9 +104,10 @@ def test(q, bus, conn, stream):
     # OK, now accept the invitation
     call_async(q, group_iface, 'AddMembers', [room_self_handle], 'Oh, OK then')
 
-    _, event = q.expect_many(
+    _, event, _ = q.expect_many(
         EventPattern('stream-presence', to='chat at conf.localhost/test'),
-        EventPattern('dbus-signal', signal='MembersChanged')
+        EventPattern('dbus-signal', signal='MembersChanged'),
+        EventPattern('dbus-return', method='AddMembers')
         )
 
     assert event.args == ['', [], [bob_handle], [],
@@ -121,8 +122,6 @@ def test(q, bus, conn, stream):
     item['role'] = 'moderator'
     stream.send(presence)
 
-    q.expect('dbus-return', method='AddMembers')
-
     event = q.expect('dbus-signal', signal='MembersChanged')
     assert event.args == ['', [room_self_handle], [], [], [], 0, 0]
 
-- 
1.5.6.3