[Telepathy-commits] [telepathy-gabble/master] Remove unneeded wait for caps hack in other jingle tests

[Senko Rasic]

---
 .../twisted/jingle/test-content-adding-removal.py  |   10 ----------
 tests/twisted/jingle/test-dialects-outgoing.py     |   10 ----------
 tests/twisted/jingle/test-outgoing-call-ensure.py  |   10 ----------
 .../jingle/test-outgoing-call-requestotron.py      |   10 ----------
 tests/twisted/jingle/test-outgoing-call.py         |   10 ----------
 5 files changed, 0 insertions(+), 50 deletions(-)

diff --git a/tests/twisted/jingle/test-content-adding-removal.py b/tests/twisted/jingle/test-content-adding-removal.py
index 9a8b91f..118e9d9 100644
--- a/tests/twisted/jingle/test-content-adding-removal.py
+++ b/tests/twisted/jingle/test-content-adding-removal.py
@@ -53,16 +53,6 @@ def test(q, bus, conn, stream):
     media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
     group_iface = make_channel_proxy(conn, path, 'Channel.Interface.Group')
 
-    # FIXME: Hack to make sure the disco info has been processed - we need to
-    # send Gabble some XML that will cause an event when processed, and
-    # wait for that event (until
-    # https://bugs.freedesktop.org/show_bug.cgi?id=15769 is fixed)
-    el = domish.Element(('jabber.client', 'presence'))
-    el['from'] = 'bob at example.com/Bar'
-    stream.send(el.toXml())
-    q.expect('dbus-signal', signal='PresenceUpdate')
-    # OK, now we can continue. End of hack
-
     # This is the interesting part of this test
 
     media_iface.RequestStreams(handle, [0]) # 0 == MEDIA_STREAM_TYPE_AUDIO
diff --git a/tests/twisted/jingle/test-dialects-outgoing.py b/tests/twisted/jingle/test-dialects-outgoing.py
index 2c651ff..aee1b16 100644
--- a/tests/twisted/jingle/test-dialects-outgoing.py
+++ b/tests/twisted/jingle/test-dialects-outgoing.py
@@ -34,16 +34,6 @@ def worker(jp, q, bus, conn, stream):
     media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
     group_iface = make_channel_proxy(conn, path, 'Channel.Interface.Group')
 
-    # FIXME: Hack to make sure the disco info has been processed - we need to
-    # send Gabble some XML that will cause an event when processed, and
-    # wait for that event (until
-    # https://bugs.freedesktop.org/show_bug.cgi?id=15769 is fixed)
-    el = domish.Element(('jabber.client', 'presence'))
-    el['from'] = 'bob at example.com/Bar'
-    stream.send(el.toXml())
-    q.expect('dbus-signal', signal='PresenceUpdate')
-    # OK, now we can continue. End of hack
-
     media_iface.RequestStreams(remote_handle, [0]) # 0 == MEDIA_STREAM_TYPE_AUDIO
 
     # S-E gets notified about new session handler, and calls Ready on it
diff --git a/tests/twisted/jingle/test-outgoing-call-ensure.py b/tests/twisted/jingle/test-outgoing-call-ensure.py
index cd15d12..a14e453 100644
--- a/tests/twisted/jingle/test-outgoing-call-ensure.py
+++ b/tests/twisted/jingle/test-outgoing-call-ensure.py
@@ -166,16 +166,6 @@ def test(q, bus, conn, stream):
 
     media_iface = make_channel_proxy(conn, path, 'Channel.Type.StreamedMedia')
 
-    # FIXME: Hack to make sure the disco info has been processed - we need to
-    # send Gabble some XML that will cause an event when processed, and
-    # wait for that event (until
-    # https://bugs.freedesktop.org/show_bug.cgi?id=15769 is fixed)
-    el = domish.Element(('jabber.client', 'presence'))
-    el['from'] = 'bob at example.com/Bar'
-    stream.send(el.toXml())
-    q.expect('dbus-signal', signal='PresenceUpdate')
-    # OK, now we can continue. End of hack
-
     # Request streams with the other person.  This should make them the
     # channel's "peer" property.
     media_iface.RequestStreams(handle, [0]) # 0 == MEDIA_STREAM_TYPE_AUDIO
diff --git a/tests/twisted/jingle/test-outgoing-call-requestotron.py b/tests/twisted/jingle/test-outgoing-call-requestotron.py
index aa517a7..d25ccd4 100644
--- a/tests/twisted/jingle/test-outgoing-call-requestotron.py
+++ b/tests/twisted/jingle/test-outgoing-call-requestotron.py
@@ -140,16 +140,6 @@ def test(q, bus, conn, stream):
     assert handle not in group_props['RemotePendingMembers'], group_props
     assert handle not in group_props['Members'], group_props
 
-    # FIXME: Hack to make sure the disco info has been processed - we need to
-    # send Gabble some XML that will cause an event when processed, and
-    # wait for that event (until
-    # https://bugs.freedesktop.org/show_bug.cgi?id=15769 is fixed)
-    el = domish.Element(('jabber.client', 'presence'))
-    el['from'] = 'bob at example.com/Bar'
-    stream.send(el.toXml())
-    q.expect('dbus-signal', signal='PresenceUpdate')
-    # OK, now we can continue. End of hack
-
     media_iface.RequestStreams(handle, [0]) # 0 == MEDIA_STREAM_TYPE_AUDIO
 
     # S-E gets notified about new session handler, and calls Ready on it
diff --git a/tests/twisted/jingle/test-outgoing-call.py b/tests/twisted/jingle/test-outgoing-call.py
index 2d49e86..8e570c7 100644
--- a/tests/twisted/jingle/test-outgoing-call.py
+++ b/tests/twisted/jingle/test-outgoing-call.py
@@ -125,16 +125,6 @@ def test(q, bus, conn, stream):
     assert 'RemotePendingMembers' in group_props, group_props
     assert 'GroupFlags' in group_props, group_props
 
-    # FIXME: Hack to make sure the disco info has been processed - we need to
-    # send Gabble some XML that will cause an event when processed, and
-    # wait for that event (until
-    # https://bugs.freedesktop.org/show_bug.cgi?id=15769 is fixed)
-    el = domish.Element(('jabber.client', 'presence'))
-    el['from'] = 'bob at example.com/Bar'
-    stream.send(el.toXml())
-    q.expect('dbus-signal', signal='PresenceUpdate')
-    # OK, now we can continue. End of hack
-
     media_iface.RequestStreams(handle, [0]) # 0 == MEDIA_STREAM_TYPE_AUDIO
 
     # S-E gets notified about new session handler, and calls Ready on it
-- 
1.5.6.5