diff options
Diffstat (limited to 'tests/twisted/channels/join-muc-channel.py')
| -rw-r--r-- | tests/twisted/channels/join-muc-channel.py | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/tests/twisted/channels/join-muc-channel.py b/tests/twisted/channels/join-muc-channel.py index 613756e..de3235a 100644 --- a/tests/twisted/channels/join-muc-channel.py +++ b/tests/twisted/channels/join-muc-channel.py @@ -16,10 +16,13 @@ def test(q, bus, conn, stream): q.expect('dbus-signal', signal='SelfHandleChanged', args=[1L]) q.expect('dbus-signal', signal='StatusChanged', args=[0, 1]) - room_handles = conn.RequestHandles(HT_ROOM, ['#idletest']) - call_async(q, conn, 'RequestChannel', CHANNEL_TYPE_TEXT, HT_ROOM, room_handles[0], True) + call_async(q, conn.Requests, 'CreateChannel', + { CHANNEL_TYPE: CHANNEL_TYPE_TEXT, + TARGET_HANDLE_TYPE: HT_ROOM, + TARGET_ID: '#idletest' }) + q.expect('stream-JOIN') - event = q.expect('dbus-return', method='RequestChannel') + event = q.expect('dbus-return', method='CreateChannel') obj_path = event.value[0] pattern = EventPattern('dbus-signal', signal='NewChannels') @@ -30,17 +33,8 @@ def test(q, bus, conn, stream): path, props = channel_details[0] assert path == obj_path assert props[TARGET_HANDLE_TYPE] == HT_ROOM - assert props[TARGET_HANDLE] == room_handles[0] assert props[CHANNEL_TYPE] == CHANNEL_TYPE_TEXT - pattern = EventPattern('dbus-signal', signal='NewChannel') - event = q.expect_many(pattern)[0] - q.forbid_events([pattern]) - assert event.args[0] == obj_path - assert event.args[1] == CHANNEL_TYPE_TEXT - assert event.args[2] == HT_ROOM - assert event.args[3] == room_handles[0] - q.expect('dbus-signal', signal='MembersChanged') call_async(q, conn, 'Disconnect') q.expect_many( |