[Telepathy-commits] [telepathy-gabble/master] offer-muc-stream-tube: use exec_tube_test

[Guillaume Desmottes]

---
 tests/twisted/tubes/offer-muc-stream-tube.py |   15 ++++-----------
 1 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/tests/twisted/tubes/offer-muc-stream-tube.py b/tests/twisted/tubes/offer-muc-stream-tube.py
index 5bb0355..0d0fe6b 100644
--- a/tests/twisted/tubes/offer-muc-stream-tube.py
+++ b/tests/twisted/tubes/offer-muc-stream-tube.py
@@ -6,8 +6,8 @@ import os
 import dbus
 
 from servicetest import call_async, EventPattern, EventProtocolFactory, unwrap
-from gabbletest import exec_test, make_result_iq, acknowledge_iq, make_muc_presence
-from bytestream import create_si_offer, parse_si_reply, BytestreamIBB, BytestreamS5B
+from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence
+from bytestream import create_si_offer, parse_si_reply
 import constants as cs
 import ns
 import tubetestutil as t
@@ -33,13 +33,7 @@ def set_up_listener_socket(q, path):
     reactor.listenUNIX(full_path, factory)
     return full_path
 
-def test_ibb(q, bus, conn, stream):
-    run_test(q, bus, conn, stream, BytestreamIBB)
-
-def test_socks5(q, bus, conn, stream):
-    run_test(q, bus, conn, stream, BytestreamS5B)
-
-def run_test(q, bus, conn, stream, bytestream_cls):
+def test(q, bus, conn, stream, bytestream_cls):
     srv_path = set_up_listener_socket(q, '/stream')
     conn.Connect()
 
@@ -387,5 +381,4 @@ def run_test(q, bus, conn, stream, bytestream_cls):
     q.expect('dbus-signal', signal='StatusChanged', args=[2, 1])
 
 if __name__ == '__main__':
-    exec_test(test_ibb)
-    exec_test(test_socks5)
+    t.exec_tube_test(test)
-- 
1.5.6.5