[telepathy-gabble/master] accept-muc-stream-tube.py: use connect_to_cm_socket helper
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Tue May 12 09:56:05 PDT 2009
---
tests/twisted/tubes/accept-muc-stream-tube.py | 11 ++++-------
1 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index 84a7568..d3a134f 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -191,14 +191,11 @@ def test(q, bus, conn, stream, bytestream_cls,
args=[stream_tube_id, 2]))
address = accept_return_event.value[0]
- t.connect_socket(q, address_type, address)
- socket_event, si_event = q.expect_many(
- EventPattern('socket-connected'),
- # expect SI request
- EventPattern('stream-iq', to='chat at conf.localhost/bob', query_ns=ns.SI,
- query_name='si'))
- protocol = socket_event.protocol
+ socket_event, si_event = t.connect_to_cm_socket(q, 'chat at conf.localhost/bob',
+ address_type, address, access_control, access_control_param)
+
+ protocol = socket_event.protocol
protocol.sendData("hello initiator")
bytestream, profile = create_from_si_offer(stream, q, bytestream_cls, si_event.stanza,
--
1.5.6.5
More information about the telepathy-commits
mailing list