[Telepathy-commits] [telepathy-gabble/master] jingle tests: fixed race in one, and disabled other test due to race conditions

[Senko Rasic]

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

diff --git a/tests/twisted/jingle/test-content-adding-removal.py b/tests/twisted/jingle/test-content-adding-removal.py
index 6a01939..9a8b91f 100644
--- a/tests/twisted/jingle/test-content-adding-removal.py
+++ b/tests/twisted/jingle/test-content-adding-removal.py
@@ -139,7 +139,7 @@ def test(q, bus, conn, stream):
     # We first remove the original stream
     media_iface.RemoveStreams([stream_id])
 
-    e = q.expect('stream-iq')
+    e = q.expect('stream-iq', iq_type='set')
     assert e.query.name == 'jingle'
     assert e.query['action'] == 'content-remove'
     stream.send(gabbletest.make_result_iq(stream, e.stanza))
diff --git a/tests/twisted/jingle/test-content-complex.py b/tests/twisted/jingle/test-content-complex.py
index e7f1ca5..5195f8f 100644
--- a/tests/twisted/jingle/test-content-complex.py
+++ b/tests/twisted/jingle/test-content-complex.py
@@ -2,6 +2,9 @@
 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
-- 
1.5.6.5