[Telepathy-commits] [telepathy-gabble/master] turn create_si_reply to a Bystream method

[Guillaume Desmottes]

---
 tests/twisted/bytestream.py                    |   34 ++++++++++++------------
 tests/twisted/tubes/accept-muc-stream-tube.py  |    5 +--
 tests/twisted/tubes/offer-private-dbus-tube.py |    4 +-
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/tests/twisted/bytestream.py b/tests/twisted/bytestream.py
index a5f2b4b..1e608d5 100644
--- a/tests/twisted/bytestream.py
+++ b/tests/twisted/bytestream.py
@@ -39,6 +39,8 @@ class Bytestream(object):
     def wait_bytestream_closed(self):
         raise NotImplemented
 
+##### XEP-0095: Stream Initiation #####
+
     def create_si_offer(self, profile):
         assert self.initiated
 
@@ -60,7 +62,21 @@ class Bytestream(object):
 
         return iq, si
 
-##### XEP-0095: Stream Initiation #####
+    def create_si_reply(self, iq):
+        result = IQ(self.stream, 'result')
+        result['id'] = iq['id']
+        result['from'] = iq['to']
+        result['to'] = self.initiator
+        res_si = result.addElement((ns.SI, 'si'))
+        res_feature = res_si.addElement((ns.FEATURE_NEG, 'feature'))
+        res_x = res_feature.addElement((ns.X_DATA, 'x'))
+        res_x['type'] = 'submit'
+        res_field = res_x.addElement((None, 'field'))
+        res_field['var'] = 'stream-method'
+        res_value = res_field.addElement((None, 'value'))
+        res_value.addContent(self.get_ns())
+
+        return result, res_si
 
 def parse_si_offer(iq):
     si_nodes = xpath.queryForNodes('/iq/si', iq)
@@ -81,22 +97,6 @@ def parse_si_offer(iq):
 
     return si['profile'], si['id'], bytestreams
 
-def create_si_reply(stream, iq, to, bytestream):
-    result = IQ(stream, 'result')
-    result['id'] = iq['id']
-    result['from'] = iq['to']
-    result['to'] = to
-    res_si = result.addElement((ns.SI, 'si'))
-    res_feature = res_si.addElement((ns.FEATURE_NEG, 'feature'))
-    res_x = res_feature.addElement((ns.X_DATA, 'x'))
-    res_x['type'] = 'submit'
-    res_field = res_x.addElement((None, 'field'))
-    res_field['var'] = 'stream-method'
-    res_value = res_field.addElement((None, 'value'))
-    res_value.addContent(bytestream)
-
-    return result, res_si
-
 def parse_si_reply(iq):
     si = xpath.queryForNodes('/iq/si[@xmlns="%s"]' % ns.SI,
             iq)[0]
diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index b3e6f98..ae0fe1b 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, create_si_reply
+from bytestream import parse_si_offer
 
 from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
@@ -224,8 +224,7 @@ def test(q, bus, conn, stream, bytestream_cls):
     assert muc_stream_node is not None
     assert muc_stream_node['tube'] == str(stream_tube_id)
 
-    result, si = create_si_reply(stream, event.stanza, 'chat at conf.localhost/test',
-        bytestream.get_ns())
+    result, si = bytestream.create_si_reply(event.stanza)
     si.addElement((ns.TUBES, 'tube'))
     stream.send(result)
 
diff --git a/tests/twisted/tubes/offer-private-dbus-tube.py b/tests/twisted/tubes/offer-private-dbus-tube.py
index a410091..a182d00 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube.py
@@ -11,7 +11,7 @@ import tubetestutil as t
 
 from twisted.words.xish import domish, xpath
 import ns
-from bytestream import parse_si_offer, create_si_reply
+from bytestream import parse_si_offer
 
 sample_parameters = dbus.Dictionary({
     's': 'hello',
@@ -77,7 +77,7 @@ def alice_accepts_tube(q, stream, iq_event, dbus_tube_id, bytestream_cls):
     bytestream = bytestream_cls(stream, q, dbus_stream_id, 'test at localhost/Resource',
         'alice at localhost/Test', False)
 
-    result, si = create_si_reply(stream, iq, bytestream.initiator, bytestream.get_ns())
+    result, si = bytestream.create_si_reply(iq)
     si.addElement((ns.TUBES, 'tube'))
     stream.send(result)
 
-- 
1.5.6.5