[Telepathy-commits] [telepathy-gabble/master] Amend muc/test-muc.py to match Alban's fix for fd.o #14467

[Simon McVittie]

20080430173237-53eee-1833bf9b961ebd6f1d9aabd73ee84f90263caefd.gz
---
 tests/twisted/muc/test-muc.py |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
index 6ee1892..18b66ce 100644
--- a/tests/twisted/muc/test-muc.py
+++ b/tests/twisted/muc/test-muc.py
@@ -51,13 +51,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'))
@@ -69,6 +62,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):
     bus = data['conn']._bus
-- 
1.5.6.3