[telepathy-gabble/master] announce a SOCKS proxy in some tube tests

[Guillaume Desmottes]

---
 tests/twisted/tubes/accept-muc-stream-tube.py     |    9 ++++++---
 tests/twisted/tubes/accept-private-stream-tube.py |    9 ++++++---
 tests/twisted/tubes/offer-private-dbus-tube.py    |    8 ++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index 3dcb79c..5cff876 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -7,7 +7,7 @@ from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence
 import constants as cs
 import ns
 import tubetestutil as t
-from bytestream import create_from_si_offer
+from bytestream import create_from_si_offer, announce_socks5_proxy
 
 from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
@@ -22,13 +22,16 @@ sample_parameters = dbus.Dictionary({
 def test(q, bus, conn, stream, bytestream_cls):
     conn.Connect()
 
-    _, iq_event = q.expect_many(
+    _, iq_event, disco_event = q.expect_many(
         EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
         EventPattern('stream-iq', to=None, query_ns='vcard-temp',
-            query_name='vCard'))
+            query_name='vCard'),
+        EventPattern('stream-iq', to='localhost', query_ns=ns.DISCO_ITEMS))
 
     acknowledge_iq(stream, iq_event.stanza)
 
+    announce_socks5_proxy(q, stream, disco_event.stanza)
+
     call_async(q, conn, 'RequestHandles', 2,
         ['chat at conf.localhost'])
 
diff --git a/tests/twisted/tubes/accept-private-stream-tube.py b/tests/twisted/tubes/accept-private-stream-tube.py
index d987fe0..3c3f5f6 100644
--- a/tests/twisted/tubes/accept-private-stream-tube.py
+++ b/tests/twisted/tubes/accept-private-stream-tube.py
@@ -17,7 +17,7 @@ from twisted.words.xish import domish, xpath
 from twisted.internet import reactor
 import ns
 import constants as cs
-from bytestream import create_from_si_offer
+from bytestream import create_from_si_offer, announce_socks5_proxy
 import tubetestutil as t
 
 bob_jid = 'bob at localhost/Bob'
@@ -113,14 +113,17 @@ def expect_tube_activity(q, bus, conn, stream, bytestream_cls):
 def test(q, bus, conn, stream, bytestream_cls):
     conn.Connect()
 
-    _, vcard_event, roster_event = q.expect_many(
+    _, vcard_event, roster_event, disco_event = q.expect_many(
         EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
         EventPattern('stream-iq', to=None, query_ns='vcard-temp',
             query_name='vCard'),
-        EventPattern('stream-iq', query_ns='jabber:iq:roster'))
+        EventPattern('stream-iq', query_ns='jabber:iq:roster'),
+        EventPattern('stream-iq', to='localhost', query_ns=ns.DISCO_ITEMS))
 
     acknowledge_iq(stream, vcard_event.stanza)
 
+    announce_socks5_proxy(q, stream, disco_event.stanza)
+
     roster = roster_event.stanza
     roster['type'] = 'result'
     item = roster_event.query.addElement('item')
diff --git a/tests/twisted/tubes/offer-private-dbus-tube.py b/tests/twisted/tubes/offer-private-dbus-tube.py
index 60b7cfd..722499c 100644
--- a/tests/twisted/tubes/offer-private-dbus-tube.py
+++ b/tests/twisted/tubes/offer-private-dbus-tube.py
@@ -11,7 +11,7 @@ import tubetestutil as t
 
 from twisted.words.xish import xpath
 import ns
-from bytestream import create_from_si_offer
+from bytestream import create_from_si_offer, announce_socks5_proxy
 from caps_helper import make_caps_disco_reply
 
 sample_parameters = dbus.Dictionary({
@@ -268,7 +268,11 @@ def offer_new_dbus_tube(q, bus, conn, stream, self_handle, alice_handle, bytestr
 def test(q, bus, conn, stream, bytestream_cls):
     conn.Connect()
 
-    q.expect('dbus-signal', signal='StatusChanged', args=[0, 1])
+    _, disco_event = q.expect_many(
+        EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
+        EventPattern('stream-iq', to='localhost', query_ns=ns.DISCO_ITEMS))
+
+    announce_socks5_proxy(q, stream, disco_event.stanza)
 
     t.check_conn_properties(q, conn)
 
-- 
1.5.6.5