[Telepathy-commits] [telepathy-gabble/master] fd.o#19161: jingletest2: expect vCard stream-iq on startup

[Simon McVittie]

If we don't wait for it before testing, we might get it later when
expecting a different stream-iq. Senko's code contains many assertions
that a received stream-iq is exactly the one we wanted, which fail if
they are given the vCard IQ instead.

Partially addresses #19161.
---
 tests/twisted/jingle/jingletest2.py |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 9305f7f..1f251f3 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -285,13 +285,17 @@ class JingleTest2:
         self.conn.Connect()
 
         # Catch events: status connecting, authentication, our presence update,
-        # status connected
+        # status connected, vCard query
+        # If we don't catch the vCard query here, it can trip us up later:
+        # http://bugs.freedesktop.org/show_bug.cgi?id=19161
         self.q.expect_many(
                 EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
                 EventPattern('stream-authenticated'),
                 EventPattern('dbus-signal', signal='PresenceUpdate',
                     args=[{1L: (0L, {u'available': {}})}]),
                 EventPattern('dbus-signal', signal='StatusChanged', args=[0, 1]),
+                EventPattern('stream-iq', to=None, query_ns='vcard-temp',
+                    query_name='vCard'),
                 )
 
         # We need remote end's presence for capabilities
-- 
1.5.6.5