telepathy-gabble: accept-muc-*-tube.py: accept the list of interfaces in either order

[Will Thompson]

Module: telepathy-gabble
Branch: master
Commit: 4002ab7685dc58053133f3998d31dbc2270f8829
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=4002ab7685dc58053133f3998d31dbc2270f8829

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Mon Nov  5 13:49:58 2012 +0000

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.

(Simon noticed this. I changed the patch in response to Jonny's review.)

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=55911

---

 tests/twisted/tubes/accept-muc-dbus-tube.py   |    7 +++++--
 tests/twisted/tubes/accept-muc-stream-tube.py |    5 +++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/tubes/accept-muc-dbus-tube.py b/tests/twisted/tubes/accept-muc-dbus-tube.py
index 782c79b..df5b81e 100644
--- a/tests/twisted/tubes/accept-muc-dbus-tube.py
+++ b/tests/twisted/tubes/accept-muc-dbus-tube.py
@@ -1,6 +1,9 @@
 import dbus
 
-from servicetest import assertEquals, assertNotEquals, call_async, EventPattern
+from servicetest import (
+    assertEquals, assertNotEquals, assertSameSets,
+    call_async, EventPattern,
+)
 from gabbletest import exec_test, acknowledge_iq, make_muc_presence
 import constants as cs
 
@@ -50,7 +53,7 @@ def test(q, bus, conn, stream, access_control):
     assertEquals(cs.CHANNEL_TYPE_DBUS_TUBE, props[cs.CHANNEL_TYPE])
     assertEquals('chat at conf.localhost/bob', props[cs.INITIATOR_ID])
     bob_handle = props[cs.INITIATOR_HANDLE]
-    assertEquals([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE],
+    assertSameSets([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE],
         props[cs.INTERFACES])
     assertEquals(False, props[cs.REQUESTED])
     assertEquals('chat at conf.localhost', props[cs.TARGET_ID])
diff --git a/tests/twisted/tubes/accept-muc-stream-tube.py b/tests/twisted/tubes/accept-muc-stream-tube.py
index 2729c51..92ec373 100644
--- a/tests/twisted/tubes/accept-muc-stream-tube.py
+++ b/tests/twisted/tubes/accept-muc-stream-tube.py
@@ -4,7 +4,7 @@ import sys
 
 import dbus
 
-from servicetest import call_async, EventPattern, EventProtocolClientFactory, unwrap, assertEquals
+from servicetest import call_async, EventPattern, EventProtocolClientFactory, unwrap, assertEquals, assertSameSets
 from gabbletest import make_result_iq, acknowledge_iq, make_muc_presence, send_error_reply, disconnect_conn
 import constants as cs
 import ns
@@ -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 at conf.localhost/bob'
-    assert props[cs.INTERFACES] == [cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE]
+    assertSameSets([cs.CHANNEL_IFACE_GROUP, cs.CHANNEL_IFACE_TUBE],
+            props[cs.INTERFACES])
     assert props[cs.REQUESTED] == False
     assert props[cs.TARGET_HANDLE] == room_handle
     assert props[cs.TARGET_ID] == 'chat at conf.localhost'