Diff

diff -rN -u old-telepathy-gabble-alban-tests/tests/twisted/jingle/test-incoming-call.py new-telepathy-gabble-alban-tests/tests/twisted/jingle/test-incoming-call.py--- old-telepathy-gabble-alban-tests/tests/twisted/jingle/test-incoming-call.py	2008-05-22 15:28:12.000000000 +0100+++ new-telepathy-gabble-alban-tests/tests/twisted/jingle/test-incoming-call.py	2008-05-22 15:28:12.000000000 +0100@@ -3,10 +3,6 @@ Test incoming call handling. """ -print "FIXME: jingle/test-incoming-call.py disabled due to race condition"-# exiting 77 causes automake to consider the test to have been skipped-raise SystemExit(77)- from gabbletest import exec_test, make_result_iq, sync_stream from servicetest import make_channel_proxy, unwrap, tp_path_prefix import jingletest@@ -34,8 +30,9 @@     jt.send_remote_presence()      # Gabble doesn't trust it, so makes a disco-    event = q.expect('stream-iq', query_ns='http://jabber.org/protocol/disco#info',-             to='foo@bar.com/Foo')+    event = q.expect('stream-iq',+                query_ns='http://jabber.org/protocol/disco#info',+                to='foo@bar.com/Foo', iq_type='get')      jt.send_remote_disco_reply(event.stanza) @@ -68,7 +65,7 @@      media_chan.RemoveMembers([dbus.UInt32(1)], 'rejected') -    e = q.expect('stream-iq')+    e = q.expect('stream-iq', iq_type='set')     assert e.query.name == 'jingle'     assert e.query['action'] == 'session-terminate' @@ -115,16 +112,8 @@     stream_handler.Ready(jt.get_audio_codecs_dbus())     stream_handler.StreamState(2) -    # First one is transport-info-    e = q.expect('stream-iq')-    assert e.query.name == 'jingle'-    assert e.query['action'] == 'transport-info'-    assert e.query['initiator'] == 'foo@bar.com/Foo'--    stream.send(gabbletest.make_result_iq(stream, e.stanza))--    # Second one is session-accept-    e = q.expect('stream-iq')+    # session-accept+    e = q.expect('stream-iq', iq_type='set')     assert e.query.name == 'jingle'     assert e.query['action'] == 'session-accept'