[Telepathy-commits] [telepathy-gabble/master] don't wait for IQ result after calling open_bytestream. That has to be done in bytestream

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Tue Mar 3 09:07:20 PST 2009


---
 tests/twisted/tubes/accept-private-dbus-tube.py |    5 +----
 tests/twisted/tubes/offer-muc-stream-tube.py    |    1 -
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index 71575cf..c490d8d 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -173,10 +173,7 @@ def test(q, bus, conn, stream, bytestream_cls):
     # Init the bytestream
     return_event = bytestream.open_bytestream(EventPattern('dbus-return', method='AcceptDBusTube'))
 
-    _, state_event = q.expect_many(
-        EventPattern('stream-iq', iq_type='result'),
-        EventPattern('dbus-signal', signal='TubeChannelStateChanged'))
-
+    state_event = q.expect('dbus-signal', signal='TubeChannelStateChanged')
     addr = return_event.value[0]
     assert len(addr) > 0
 
diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index 3d00177..bdedbe1 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -239,7 +239,6 @@ def test(q, bus, conn, stream, bytestream_cls):
 
     # have the fake client open the stream
     bytestream.open_bytestream()
-    q.expect('stream-iq', iq_type='result')
 
     # have the fake client send us some data
     bytestream.send_data('hello initiator')
-- 
1.5.6.5




More information about the telepathy-commits mailing list