[telepathy-gabble/master] port tests to test_all_dialects()

Dafydd Harries daf at rhydd.org
Tue Apr 7 09:14:45 PDT 2009


---
 tests/twisted/jingle/test-dialects-incoming.py |   14 +-------------
 tests/twisted/jingle/test-dialects-outgoing.py |   18 ++----------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/tests/twisted/jingle/test-dialects-incoming.py b/tests/twisted/jingle/test-dialects-incoming.py
index e1dadbb..4cecbce 100644
--- a/tests/twisted/jingle/test-dialects-incoming.py
+++ b/tests/twisted/jingle/test-dialects-incoming.py
@@ -111,18 +111,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)
-
-def testg3(q, bus, conn, stream):
-    return worker(GtalkProtocol03(), q, bus, conn, stream)
-
-def testg4(q, bus, conn, stream):
-    return worker(GtalkProtocol04(), q, bus, conn, stream)
-
 if __name__ == '__main__':
-    exec_tests([testg3, testg4, test015, test031])
+    test_all_dialects(worker)
 
diff --git a/tests/twisted/jingle/test-dialects-outgoing.py b/tests/twisted/jingle/test-dialects-outgoing.py
index 57f6b13..141ac2c 100644
--- a/tests/twisted/jingle/test-dialects-outgoing.py
+++ b/tests/twisted/jingle/test-dialects-outgoing.py
@@ -113,20 +113,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)
-
-def testg3(q, bus, conn, stream):
-    return worker(GtalkProtocol03(), q, bus, conn, stream)
-
-def testg4(q, bus, conn, stream):
-    return worker(GtalkProtocol04(), q, bus, conn, stream)
-
 if __name__ == '__main__':
-    exec_test(testg3)
-    exec_test(testg4)
-    exec_test(test015)
-    exec_test(test031)
+    test_all_dialects(worker)
+
-- 
1.5.6.5




More information about the telepathy-commits mailing list