[Telepathy-commits] [telepathy-gabble/master] Unrace olpc-muc-invitation.py

[Will Thompson]

Reviewed-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
---
 tests/twisted/olpc/olpc-muc-invitation.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/twisted/olpc/olpc-muc-invitation.py b/tests/twisted/olpc/olpc-muc-invitation.py
index d7b5e23..76de0ef 100644
--- a/tests/twisted/olpc/olpc-muc-invitation.py
+++ b/tests/twisted/olpc/olpc-muc-invitation.py
@@ -201,7 +201,11 @@ def test(q, bus, conn, stream):
     call_async(q, act_prop_iface, 'SetProperties',
         handles['chat'], {'color': '#f00baa,#f00baa', 'private': True})
 
-    event = q.expect('stream-message', to='alice at localhost')
+    event, apc_event, _ = q.expect_many(
+        EventPattern('stream-message', to='alice at localhost'),
+        EventPattern('dbus-signal', signal='ActivityPropertiesChanged'),
+        EventPattern('dbus-return', method='SetProperties'),
+        )
     message = event.stanza
 
     properties = xpath.queryForNodes('/message/properties', message)
@@ -226,13 +230,10 @@ def test(q, bus, conn, stream):
     assert 'color' in seen, seen
     assert 'private' in seen, seen
 
-    event = q.expect('dbus-signal', signal='ActivityPropertiesChanged')
-    chat_handle, props = event.args
+    chat_handle, props = apc_event.args
     assert chat_handle == handles['chat']
     assert props == {'color': '#f00baa,#f00baa', 'private' : True}
 
-    q.expect('dbus-return', method='SetProperties')
-
     conn.Disconnect()
 
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
-- 
1.5.6.5