[Telepathy-commits] [telepathy-gabble/master] ./tests/twisted/vcard/test-muc-alias.py: adjust for #14467 being fixed

Simon McVittie simon.mcvittie at collabora.co.uk
Tue Aug 19 10:51:54 PDT 2008


20080430174623-53eee-2350be998c53808ea72e7722593ab76a12c8c14d.gz
---
 tests/twisted/vcard/test-muc-alias.py |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/vcard/test-muc-alias.py b/tests/twisted/vcard/test-muc-alias.py
index b05442b..141cf4a 100644
--- a/tests/twisted/vcard/test-muc-alias.py
+++ b/tests/twisted/vcard/test-muc-alias.py
@@ -55,13 +55,6 @@ def expect_presence(event, data):
     item['affiliation'] = 'owner'
     item['role'] = 'moderator'
     data['stream'].send(presence)
-    return True
-
- at match('dbus-signal', signal='MembersChanged',
-    args=[u'', [3], [], [], [], 0, 0])
-def expect_members_changed2(event, data):
-    assert data['conn_iface'].InspectHandles(1, [3]) == [
-        'chat at conf.localhost/bob']
 
     # Send presence for own membership of room.
     presence = domish.Element((None, 'presence'))
@@ -73,6 +66,16 @@ def expect_members_changed2(event, data):
     data['stream'].send(presence)
     return True
 
+ at match('dbus-signal', signal='MembersChanged',
+    args=[u'', [2, 3], [], [], [], 0, 0])
+def expect_members_changed2(event, data):
+    assert data['conn_iface'].InspectHandles(1, [2]) == [
+        'chat at conf.localhost/test']
+    assert data['conn_iface'].InspectHandles(1, [3]) == [
+        'chat at conf.localhost/bob']
+
+    return True
+
 @match('dbus-return', method='RequestChannel')
 def expect_request_channel_return(event, data):
     assert aliasing_iface(data['conn']).RequestAliases([3]) == ['bob']
-- 
1.5.6.3




More information about the Telepathy-commits mailing list