[Telepathy-commits] [telepathy-gabble/master] jingle/test-content-complex: Apply the same workaround as for dialects-outgoing

Simon McVittie simon.mcvittie at collabora.co.uk
Mon Feb 2 10:04:23 PST 2009


---
 tests/twisted/jingle/test-content-complex.py |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/jingle/test-content-complex.py b/tests/twisted/jingle/test-content-complex.py
index e35d342..d756710 100644
--- a/tests/twisted/jingle/test-content-complex.py
+++ b/tests/twisted/jingle/test-content-complex.py
@@ -2,9 +2,6 @@
 Test everything related to contents
 """
 
-print "FIXME: Disabled due to race condition somewhere in Twisted XMPP support"
-raise SystemExit(77)
-
 from gabbletest import exec_test, make_result_iq, sync_stream, exec_tests
 from servicetest import make_channel_proxy, unwrap, tp_path_prefix, \
         EventPattern
@@ -230,5 +227,6 @@ def test031(q, bus, conn, stream):
     return worker(JingleProtocol031(),q, bus, conn, stream)
 
 if __name__ == '__main__':
-    exec_tests([test015, test031])
+    exec_test(test015)
+    exec_test(test031)
 
-- 
1.5.6.5




More information about the Telepathy-commits mailing list