[telepathy-gabble/master] make expects for presence events more specific

[Dafydd Harries]

This fixes a regression introduced by my initial-contacts-presence branch.
---
 .../twisted/file-transfer/file_transfer_helper.py  |    6 ++----
 tests/twisted/presence/presence.py                 |    8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 0b49abd..5c4119f 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -92,7 +92,8 @@ class FileTransferTest(object):
         disco_event, presence_event = self.q.expect_many(
             EventPattern('stream-iq', iq_type='get',
                 query_ns='http://jabber.org/protocol/disco#info', to=self.contact_full_jid),
-            EventPattern('dbus-signal', signal='PresencesChanged'))
+            EventPattern('dbus-signal', signal='PresencesChanged', args=[
+                {self.handle: (cs.PRESENCE_AVAILABLE, u'available', u'')}]))
 
         assert disco_event.query['node'] == \
             'http://example.com/ISupportFT#1.0'
@@ -102,9 +103,6 @@ class FileTransferTest(object):
         feature['var'] = ns.FILE_TRANSFER
         self.stream.send(result)
 
-        h = presence_event.args[0].keys()[0]
-        assert h == self.handle
-
         sync_stream(self.q, self.stream)
 
     def create_ft_channel(self):
diff --git a/tests/twisted/presence/presence.py b/tests/twisted/presence/presence.py
index ce4cd66..901c88c 100644
--- a/tests/twisted/presence/presence.py
+++ b/tests/twisted/presence/presence.py
@@ -37,8 +37,8 @@ def test(q, bus, conn, stream):
     status.addContent('At the pub')
     stream.send(presence)
 
-    event = q.expect('dbus-signal', signal='PresencesChanged')
-    assert event.args[0] == { amy_handle: (3, 'away', 'At the pub') }
+    event = q.expect('dbus-signal', signal='PresencesChanged',
+        args=[{amy_handle: (3, 'away', 'At the pub')}])
 
     presence = domish.Element((None, 'presence'))
     presence['from'] = 'amy at foo.com'
@@ -48,8 +48,8 @@ def test(q, bus, conn, stream):
     status.addContent('I may have been drinking')
     stream.send(presence)
 
-    event = q.expect('dbus-signal', signal='PresencesChanged')
-    assert event.args[0] == { amy_handle: (2, 'chat', 'I may have been drinking') }
+    event = q.expect('dbus-signal', signal='PresencesChanged',
+        args=[{amy_handle: (2, 'chat', 'I may have been drinking')}])
 
 if __name__ == '__main__':
     exec_test(test)
-- 
1.5.6.5