[Telepathy-commits] [telepathy-gabble/master] Test that we get signals from both Presence and SimplePresence

[Sjoerd Simons]

20080730095830-b58c9-c4c793f5fcb0adef90b75ac00cba5130713ca347.gz
---
 tests/twisted/test-caps-cache.py |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/test-caps-cache.py b/tests/twisted/test-caps-cache.py
index 9977439..1f497fd 100644
--- a/tests/twisted/test-caps-cache.py
+++ b/tests/twisted/test-caps-cache.py
@@ -9,6 +9,7 @@ import sys
 
 from twisted.words.xish import domish, xpath
 
+from servicetest import EventPattern
 from gabbletest import exec_test, make_result_iq
 
 text = 'org.freedesktop.Telepathy.Channel.Type.Text'
@@ -42,8 +43,14 @@ def _test_without_hash(q, bus, conn, stream, contact, contact_handle, client, di
     presence = make_presence(contact, None, 'hello')
     stream.send(presence)
 
-    event = q.expect('dbus-signal', signal='PresenceUpdate',
-        args=[{contact_handle: (0L, {u'available': {'message': 'hello'}})}])
+    _,_ = q.expect_many(
+        EventPattern('dbus-signal', signal='PresenceUpdate',
+            args=[{contact_handle:
+               (0L, {u'available': {'message': 'hello'}})}]),
+        EventPattern('dbus-signal', signal='PresencesChanged',
+            args=[{contact_handle:
+               (2, u'available', 'hello')}]))
+
 
     # no special capabilities
     basic_caps = [(contact_handle, text, 3, 0)]
@@ -81,8 +88,13 @@ def _test_with_hash(q, bus, conn, stream, contact, contact_handle, client, disco
     presence = make_presence(contact, None, 'hello')
     stream.send(presence)
 
-    event = q.expect('dbus-signal', signal='PresenceUpdate',
-        args=[{contact_handle: (0L, {u'available': {'message': 'hello'}})}])
+    _,_ = q.expect_many(
+        EventPattern('dbus-signal', signal='PresenceUpdate',
+            args=[{contact_handle:
+               (0L, {u'available': {'message': 'hello'}})}]),
+        EventPattern('dbus-signal', signal='PresencesChanged',
+            args=[{contact_handle:
+               (2, u'available', 'hello')}]))
 
     # no special capabilities
     basic_caps = [(contact_handle, text, 3, 0)]
-- 
1.5.6.3