[telepathy-gabble/telepathy-gabble-0.8] test-avatar-multiple-resources.py: Don't expect AvatarUpdated for self_handle before conflict resolution

[Alban Crequy]

The D-Bus signal AvatarUpdated is usually emitted as soon as we receive a
presence stanza from a contact: we don't want to wait to receive the vCard with
the actual avatar because we don't ask the vCard unless an application
specifically request it. However, when we receive a presence stanza from
'ourselves' on another resource, we emit the signal AvatarUpdated only when the
conflict resolution is finished. This commit change the test to reflect that.
---
 .../vcard/test-avatar-multiple-resources.py        |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/vcard/test-avatar-multiple-resources.py b/tests/twisted/vcard/test-avatar-multiple-resources.py
index fb3a779..99d24af 100644
--- a/tests/twisted/vcard/test-avatar-multiple-resources.py
+++ b/tests/twisted/vcard/test-avatar-multiple-resources.py
@@ -46,16 +46,13 @@ def test(q, bus, conn, stream):
     # A presence from myself on another resource
     stream.send(make_presence('test at localhost/resource1',
         'SHA1SUM-FOR-MYSELF-RES1'))
-    q.forbid_events([AvatarRetrieved_event])
-    stream_presence, avatar_update, stream_iq = q.expect_many(
+    q.forbid_events([AvatarRetrieved_event, AvatarUpdated_event])
+    stream_presence, stream_iq = q.expect_many(
         EventPattern('stream-presence'),
-        EventPattern('dbus-signal', signal='AvatarUpdated'),
         EventPattern('stream-iq', to=None, query_ns='vcard-temp',
             query_name='vCard'))
-    assert avatar_update.args[0] == 1, avatar_update.args
-    assert avatar_update.args[1] == "", avatar_update.args
     sync_dbus(bus, q, conn)
-    q.unforbid_events([AvatarRetrieved_event])
+    q.unforbid_events([AvatarRetrieved_event, AvatarUpdated_event])
 
     # If the server wrongly send a presence stanza with our resource,
     # AvatarUpdated must not be emitted
-- 
1.5.6.5