[Telepathy-commits] [telepathy-gabble/master] use Bytestream.check_si_reply instead of parse_si_reply

[Guillaume Desmottes]

---
 tests/twisted/bytestream.py                      |   17 ++++++++---------
 tests/twisted/tubes/accept-private-dbus-tube.py  |    7 ++-----
 tests/twisted/tubes/offer-muc-stream-tube.py     |    4 +---
 tests/twisted/tubes/offer-private-stream-tube.py |    7 ++-----
 4 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/tests/twisted/bytestream.py b/tests/twisted/bytestream.py
index 1e608d5..bd3b62e 100644
--- a/tests/twisted/bytestream.py
+++ b/tests/twisted/bytestream.py
@@ -78,6 +78,14 @@ class Bytestream(object):
 
         return result, res_si
 
+    def check_si_reply(self, iq):
+        si = xpath.queryForNodes('/iq/si[@xmlns="%s"]' % ns.SI,
+                iq)[0]
+        value = xpath.queryForNodes('/si/feature/x/field/value', si)
+        assert len(value) == 1
+        proto = value[0]
+        assert str(proto) == self.get_ns()
+
 def parse_si_offer(iq):
     si_nodes = xpath.queryForNodes('/iq/si', iq)
     assert si_nodes is not None
@@ -97,15 +105,6 @@ def parse_si_offer(iq):
 
     return si['profile'], si['id'], bytestreams
 
-def parse_si_reply(iq):
-    si = xpath.queryForNodes('/iq/si[@xmlns="%s"]' % ns.SI,
-            iq)[0]
-    value = xpath.queryForNodes('/si/feature/x/field/value', si)
-    assert len(value) == 1
-    proto = value[0]
-    return str(proto)
-
-
 ##### XEP-0065: SOCKS5 Bytestreams #####
 
 class BytestreamS5B(Bytestream):
diff --git a/tests/twisted/tubes/accept-private-dbus-tube.py b/tests/twisted/tubes/accept-private-dbus-tube.py
index 7ee53fa..b36c5c9 100644
--- a/tests/twisted/tubes/accept-private-dbus-tube.py
+++ b/tests/twisted/tubes/accept-private-dbus-tube.py
@@ -7,7 +7,6 @@ from gabbletest import acknowledge_iq, sync_stream
 import constants as cs
 import ns
 import tubetestutil as t
-from bytestream import parse_si_reply
 
 from twisted.words.xish import domish, xpath
 
@@ -132,8 +131,7 @@ def test(q, bus, conn, stream, bytestream_cls):
     call_async(q, tubes_iface, 'AcceptDBusTube', id)
 
     event = q.expect('stream-iq', iq_type='result')
-    bytestream_type = parse_si_reply (event.stanza)
-    assert bytestream_type == bytestream.get_ns()
+    bytestream.check_si_reply(event.stanza)
     tube = xpath.queryForNodes('/iq/si/tube[@xmlns="%s"]' % ns.TUBES,
         event.stanza)
     assert len(tube) == 1
@@ -182,8 +180,7 @@ def test(q, bus, conn, stream, bytestream_cls):
     call_async(q, dbus_tube_iface, 'AcceptDBusTube')
 
     event = q.expect('stream-iq', iq_type='result')
-    bytestream_type = parse_si_reply (event.stanza)
-    assert bytestream_type == bytestream.get_ns()
+    bytestream.check_si_reply(event.stanza)
     tube = xpath.queryForNodes('/iq/si/tube[@xmlns="%s"]' % ns.TUBES, event.stanza)
     assert len(tube) == 1
 
diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index 822651f..3d00177 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -7,7 +7,6 @@ import dbus
 
 from servicetest import call_async, EventPattern, EventProtocolFactory, unwrap
 from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence
-from bytestream import parse_si_reply
 import constants as cs
 import ns
 import tubetestutil as t
@@ -234,8 +233,7 @@ def test(q, bus, conn, stream, bytestream_cls):
             args=[stream_tube_id, bob_handle]))
 
     # handle iq_event
-    proto = parse_si_reply(iq_event.stanza)
-    assert proto == bytestream.get_ns()
+    bytestream.check_si_reply(iq_event.stanza)
     tube = xpath.queryForNodes('/iq//si/tube[@xmlns="%s"]' % ns.TUBES, iq_event.stanza)
     assert len(tube) == 1
 
diff --git a/tests/twisted/tubes/offer-private-stream-tube.py b/tests/twisted/tubes/offer-private-stream-tube.py
index 5440bff..0590375 100644
--- a/tests/twisted/tubes/offer-private-stream-tube.py
+++ b/tests/twisted/tubes/offer-private-stream-tube.py
@@ -7,7 +7,6 @@ from gabbletest import acknowledge_iq, sync_stream
 import constants as cs
 import ns
 import tubetestutil as t
-from bytestream import parse_si_reply
 
 from twisted.words.xish import domish, xpath
 
@@ -333,8 +332,7 @@ def test(q, bus, conn, stream, bytestream_cls):
             EventPattern('dbus-signal', signal='TubeStateChanged',
                 args=[stream_tube_id, cs.TUBE_STATE_OPEN]))
 
-    bytestream = parse_si_reply(si_reply_event.stanza)
-    assert bytestream == bytestream1.get_ns()
+    bytestream1.check_si_reply(si_reply_event.stanza)
     tube = xpath.queryForNodes('/iq/si/tube[@xmlns="%s"]' % ns.TUBES,
         si_reply_event.stanza)
     assert len(tube) == 1
@@ -362,8 +360,7 @@ def test(q, bus, conn, stream, bytestream_cls):
             EventPattern('dbus-signal', signal='TubeChannelStateChanged',
                 args=[cs.TUBE_STATE_OPEN]))
 
-    bytestream = parse_si_reply(si_reply_event.stanza)
-    assert bytestream == bytestream2.get_ns()
+    bytestream2.check_si_reply(si_reply_event.stanza)
     tube = xpath.queryForNodes('/iq/si/tube[@xmlns="%s"]' % ns.TUBES,
         si_reply_event.stanza)
     assert len(tube) == 1
-- 
1.5.6.5