[Telepathy-commits] [telepathy-gabble/master] Fix end of call in test for call rejection

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Aug 19 10:53:50 PDT 2008


20080721194404-53eee-70bee3c1764f269811268d2b2a936e5312f7cc80.gz
---
 tests/twisted/jingle/test-incoming-call-reject.py |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/twisted/jingle/test-incoming-call-reject.py b/tests/twisted/jingle/test-incoming-call-reject.py
index 64051d5..8124130 100644
--- a/tests/twisted/jingle/test-incoming-call-reject.py
+++ b/tests/twisted/jingle/test-incoming-call-reject.py
@@ -78,14 +78,15 @@ def test(q, bus, conn, stream):
 
     media_chan.RemoveMembers([dbus.UInt32(1)], 'rejected')
 
-    e = q.expect('stream-iq')
-    assert e.query.name == 'jingle'
-    assert e.query['action'] == 'session-terminate'
+    iq, signal = q.expect_many(
+            EventPattern('stream-iq'),
+            EventPattern('dbus-signal', signal='Closed'),
+            )
+    assert iq.query.name == 'jingle'
+    assert iq.query['action'] == 'session-terminate'
 
     # Tests completed, close the connection
 
-    e = q.expect('dbus-signal', signal='Close') #XXX - match against the path
-
     conn.Disconnect()
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
 
-- 
1.5.6.3




More information about the Telepathy-commits mailing list