diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-30 17:44:57 +0000 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2008-04-30 17:44:57 +0000 |
commit | d1749f768d4ef3bd3e1bf0ca888a3b0140dc0861 (patch) | |
tree | 5b7f606c150b1cca081b35cbeae3abff0307b860 | |
parent | e5bc867d100bef6433bb97a2279a447a3f909d0b (diff) |
test-get-available-tubes.py: adjust for #14467 having been fixed
-rw-r--r-- | tests/twisted/tubes/test-get-available-tubes.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/twisted/tubes/test-get-available-tubes.py b/tests/twisted/tubes/test-get-available-tubes.py index 776390384..0e5480522 100644 --- a/tests/twisted/tubes/test-get-available-tubes.py +++ b/tests/twisted/tubes/test-get-available-tubes.py @@ -63,12 +63,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@conf.localhost/bob'] - bob_handle = 3 - # Send presence for own membership of room. presence = domish.Element((None, 'presence')) presence['from'] = 'chat@conf.localhost/test' @@ -78,6 +72,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@conf.localhost/test'] + assert conn.InspectHandles(1, [3]) == ['chat@conf.localhost/bob'] + bob_handle = 3 + event = q.expect('dbus-return', method='RequestChannel') tubes_chan = bus.get_object(conn.bus_name, event.value[0]) |