From d376e7b1d591739d9c8b5c85122d2deb4a080d29 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 12 Oct 2012 12:22:21 +0100 Subject: [PATCH] accept-muc-*-tube.py: accept the list of interfaces in either order The order swapped in commit fde8437a, and in principle it should never have mattered anyway. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55911 Signed-off-by: Simon McVittie --- tests/twisted/tubes/accept-muc-dbus-tube.py | 4 ++-- tests/twisted/tubes/accept-muc-stream-tube.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py index 782c79b..d87d0bc 100644 --- a/tests/twisted/tubes/accept-muc-dbus-tube.py +++ b/tests/twisted/tubes/accept-muc-dbus-tube.py @@ -50,8 +50,8 @@ def test(q, bus, conn, stream, access_control): assertEquals(cs.CHANNEL_TYPE_DBUS_TUBE, props[cs.CHANNEL_TYPE]) assertEquals('chat@conf.localhost/bob', props[cs.INITIATOR_ID]) bob_handle = props[cs.INITIATOR_HANDLE] - assertEquals([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE], - props[cs.INTERFACES]) + assertEquals(set([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE]), + set(props[cs.INTERFACES])) assertEquals(False, props[cs.REQUESTED]) assertEquals('chat@conf.localhost', props[cs.TARGET_ID]) assertEquals('com.example.Test', props[cs.DBUS_TUBE_SERVICE_NAME]) diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py index 2729c51..3230b55 100644 --- a/tests/twisted/tubes/accept-muc-stream-tube.py +++ b/tests/twisted/tubes/accept-muc-stream-tube.py @@ -128,7 +128,8 @@ def test(q, bus, conn, stream, bytestream_cls, assert props[cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_STREAM_TUBE assert props[cs.INITIATOR_HANDLE] == bob_handle assert props[cs.INITIATOR_ID] == 'chat@conf.localhost/bob' - assert props[cs.INTERFACES] == [cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE] + assertEquals(set([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE]), + set(props[cs.INTERFACES])) assert props[cs.REQUESTED] == False assert props[cs.TARGET_HANDLE] == room_handle assert props[cs.TARGET_ID] == 'chat@conf.localhost' -- 1.7.10.4