[telepathy-gabble/master] port test-content-complex.py to test_dialects()

[Dafydd Harries]

---
 tests/twisted/jingle/test-content-complex.py |   13 +++----------
 1 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/tests/twisted/jingle/test-content-complex.py b/tests/twisted/jingle/test-content-complex.py
index 6b9b7db..de978c4 100644
--- a/tests/twisted/jingle/test-content-complex.py
+++ b/tests/twisted/jingle/test-content-complex.py
@@ -10,9 +10,9 @@ import dbus
 import time
 from twisted.words.xish import xpath
 
-from jingletest2 import *
-
 import constants as cs
+from jingletest2 import (
+    JingleTest2, JingleProtocol015, JingleProtocol031, test_dialects)
 
 def worker(jp, q, bus, conn, stream):
 
@@ -218,13 +218,6 @@ def worker(jp, q, bus, conn, stream):
     return True
 
 
-def test015(q, bus, conn, stream):
-    return worker(JingleProtocol015(), q, bus, conn, stream)
-
-def test031(q, bus, conn, stream):
-    return worker(JingleProtocol031(),q, bus, conn, stream)
-
 if __name__ == '__main__':
-    exec_test(test015)
-    exec_test(test031)
+    test_dialects(worker, [JingleProtocol015, JingleProtocol031])
 
-- 
1.5.6.5