telepathy-rakia: test-message: make the test pass again

[Simon McVittie]

Module: telepathy-rakia
Branch: master
Commit: 47ec8244fcf304d961e065d534f4c0fd8fb48db2
URL:    http://cgit.freedesktop.org/telepathy/telepathy-rakia/commit/?id=47ec8244fcf304d961e065d534f4c0fd8fb48db2

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Aug  7 17:08:33 2013 +0100

test-message: make the test pass again

This was wrongly asserting that Text channels only had the Destroyable
interface, and regressed when we fixed the bug that the Messages
interface was missing.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67872
Signed-off-by: Simon McVittie <simon.mcvittie at collabora.co.uk>
Reviewed-by: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>

---

 tests/twisted/test-message.py |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/tests/twisted/test-message.py b/tests/twisted/test-message.py
index 01c401c..0b849a0 100644
--- a/tests/twisted/test-message.py
+++ b/tests/twisted/test-message.py
@@ -1,7 +1,9 @@
 # -*- coding: utf-8 -*-
 
-from servicetest import tp_name_prefix, tp_path_prefix, unwrap
+from servicetest import (tp_name_prefix, tp_path_prefix, unwrap,
+        assertSameSets)
 from sofiatest import go, exec_test
+import constants as cs
 
 import twisted.protocols.sip
 
@@ -14,7 +16,6 @@ import uuid
 
 CHANNEL = tp_name_prefix + '.Channel'
 TEXT_TYPE = tp_name_prefix + '.Channel.Type.Text'
-DESTROYABLE_IFACE = tp_name_prefix + '.Channel.Interface.Destroyable'
 
 FROM_URL = 'sip:other.user at somewhere.else.com'
 
@@ -30,7 +31,8 @@ def test_new_channel(q, bus, conn, target_uri, initiator_uri, requested):
             dbus_interface='org.freedesktop.DBus.Properties')
     assert text_props['ChannelType'] == TEXT_TYPE, text_props
     assert 'Interfaces' in text_props, text_props
-    assert text_props['Interfaces'] == [DESTROYABLE_IFACE], text_props
+    assertSameSets((cs.CHANNEL_IFACE_MESSAGES, cs.CHANNEL_IFACE_DESTROYABLE),
+            text_props['Interfaces'])
     assert 'TargetHandle' in text_props, text_props
     assert text_props['TargetHandle'] == handle, \
             (text_props, handle)
@@ -131,7 +133,7 @@ def test(q, bus, conn, sip):
 
     conn.ReleaseHandles(1, [handle])
 
-    iface = dbus.Interface(incoming_obj, DESTROYABLE_IFACE)
+    iface = dbus.Interface(incoming_obj, cs.CHANNEL_IFACE_DESTROYABLE)
     iface.Destroy()
     del iface
     event = q.expect('dbus-signal', signal='Closed')