[Telepathy-commits] [telepathy-gabble/master] tests/twisted/tubes/test-muc-*: adjust for #14467 being fixed

[Simon McVittie]

20080430174557-53eee-b2409a400057d4e58a45d88f59a3a4f15cf0b124.gz
---
 .../tubes/test-muc-accept-stream-tube-ibb.py       |   13 +++++++------
 tests/twisted/tubes/test-muc-offer-dbus-tube.py    |   13 +++++++------
 .../tubes/test-muc-offer-stream-tube-ibb.py        |   13 +++++++------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
index bd3d4a3..f62bb28 100644
--- a/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
+++ b/tests/twisted/tubes/test-muc-accept-stream-tube-ibb.py
@@ -66,12 +66,6 @@ def test(q, bus, conn, stream):
     item['role'] = 'moderator'
     stream.send(presence)
 
-    q.expect('dbus-signal', signal='MembersChanged',
-            args=[u'', [3], [], [], [], 0, 0])
-
-    conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
-    bob_handle = 3
-
     # Send presence for own membership of room.
     presence = domish.Element((None, 'presence'))
     presence['from'] = 'chat at conf.localhost/test'
@@ -81,6 +75,13 @@ def test(q, bus, conn, stream):
     item['role'] = 'participant'
     stream.send(presence)
 
+    q.expect('dbus-signal', signal='MembersChanged',
+            args=[u'', [2, 3], [], [], [], 0, 0])
+
+    assert conn.InspectHandles(1, [2]) == ['chat at conf.localhost/test']
+    assert conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
+    bob_handle = 3
+
     event = q.expect('dbus-return', method='RequestChannel')
 
     # Bob offers a stream tube
diff --git a/tests/twisted/tubes/test-muc-offer-dbus-tube.py b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
index a3879d2..c5ada66 100644
--- a/tests/twisted/tubes/test-muc-offer-dbus-tube.py
+++ b/tests/twisted/tubes/test-muc-offer-dbus-tube.py
@@ -66,12 +66,6 @@ def test(q, bus, conn, stream):
     item['role'] = 'moderator'
     stream.send(presence)
 
-    q.expect('dbus-signal', signal='MembersChanged',
-            args=[u'', [3], [], [], [], 0, 0])
-
-    conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
-    bob_handle = 3
-
     # Send presence for own membership of room.
     presence = domish.Element((None, 'presence'))
     presence['from'] = 'chat at conf.localhost/test'
@@ -81,6 +75,13 @@ def test(q, bus, conn, stream):
     item['role'] = 'participant'
     stream.send(presence)
 
+    q.expect('dbus-signal', signal='MembersChanged',
+            args=[u'', [2, 3], [], [], [], 0, 0])
+
+    assert conn.InspectHandles(1, [2]) == ['chat at conf.localhost/test']
+    assert conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
+    bob_handle = 3
+
     event = q.expect('dbus-return', method='RequestChannel')
 
     tubes_chan = bus.get_object(conn.bus_name, event.value[0])
diff --git a/tests/twisted/tubes/test-muc-offer-stream-tube-ibb.py b/tests/twisted/tubes/test-muc-offer-stream-tube-ibb.py
index ebc73fd..e938c31 100644
--- a/tests/twisted/tubes/test-muc-offer-stream-tube-ibb.py
+++ b/tests/twisted/tubes/test-muc-offer-stream-tube-ibb.py
@@ -79,12 +79,6 @@ def test(q, bus, conn, stream):
     item['role'] = 'moderator'
     stream.send(presence)
 
-    q.expect('dbus-signal', signal='MembersChanged',
-            args=[u'', [3], [], [], [], 0, 0])
-
-    conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
-    bob_handle = 3
-
     # Send presence for own membership of room.
     presence = domish.Element((None, 'presence'))
     presence['from'] = 'chat at conf.localhost/test'
@@ -94,6 +88,13 @@ def test(q, bus, conn, stream):
     item['role'] = 'participant'
     stream.send(presence)
 
+    q.expect('dbus-signal', signal='MembersChanged',
+            args=[u'', [2, 3], [], [], [], 0, 0])
+
+    assert conn.InspectHandles(1, [2]) == ['chat at conf.localhost/test']
+    assert conn.InspectHandles(1, [3]) == ['chat at conf.localhost/bob']
+    bob_handle = 3
+
     event = q.expect('dbus-return', method='RequestChannel')
 
     tubes_chan = bus.get_object(conn.bus_name, event.value[0])
-- 
1.5.6.3