[Telepathy-commits] [telepathy-gabble/master] accept-muc-stream-tube.py: use create_from_si_offer

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Mon Mar 2 03:41:40 PST 2009


---
 tests/twisted/tubes/accept-muc-stream-tube.py |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index ae0fe1b..2a86a65 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -7,7 +7,7 @@ from gabbletest import make_result_iq, acknowledge_iq
 import constants as cs
 import ns
 import tubetestutil as t
-from bytestream import parse_si_offer
+from bytestream import create_from_si_offer
 
 from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
@@ -211,12 +211,9 @@ def test(q, bus, conn, stream, bytestream_cls):
     event = q.expect('stream-iq', to='chat at conf.localhost/bob', query_ns=ns.SI,
         query_name='si')
 
-    profile, stream_id, bytestreams = parse_si_offer(event.stanza)
+    bytestream, profile = create_from_si_offer(stream, q, bytestream_cls, event.stanza,
+            'chat at conf.localhost/test')
 
-    bytestream = bytestream_cls(stream, q, stream_id, 'chat at conf.localhost/test',
-        event.stanza['to'], False)
-
-    assert bytestream.get_ns() in bytestreams
     assert profile == ns.TUBES
 
     muc_stream_node = xpath.queryForNodes('/iq/si/muc-stream[@xmlns="%s"]' %
-- 
1.5.6.5




More information about the telepathy-commits mailing list