summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJonny Lamb <jonny.lamb@collabora.co.uk>2012-05-31 16:01:27 +0100
committerJonny Lamb <jonny.lamb@collabora.co.uk>2012-05-31 16:19:31 +0100
commit9f16272288dcb115e94fdced6fed48b3c14a6150 (patch)
treeab52c6009e6ad0b22eff793445ce370e3b4242da /tests
parent52468dfb239962f924023c61eef66a3197586ac9 (diff)
downloadtelepathy-salut-9f16272288dcb115e94fdced6fed48b3c14a6150.tar.gz
muc-manager: remove all old TubesChannel references
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'tests')
-rw-r--r--tests/twisted/avahi/tubes/request-muc-tubes.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/twisted/avahi/tubes/request-muc-tubes.py b/tests/twisted/avahi/tubes/request-muc-tubes.py
index f5921c0c..ce54ab35 100644
--- a/tests/twisted/avahi/tubes/request-muc-tubes.py
+++ b/tests/twisted/avahi/tubes/request-muc-tubes.py
@@ -9,7 +9,7 @@ import avahitest
from twisted.words.xish import domish
from saluttest import exec_test, wait_for_contact_list
-from servicetest import call_async, EventPattern, wrap_channel
+from servicetest import call_async, EventPattern, wrap_channel, pretty
from constants import *
def test(q, bus, conn):
@@ -23,11 +23,11 @@ def test(q, bus, conn):
# announced so they won't interfere with the muc ones announces.
wait_for_contact_list(q, conn)
- # check if we can request roomlist channels
+ # check if we can request tube channels
properties = conn.Properties.GetAll(CONN_IFACE_REQUESTS)
- assert ({CHANNEL_TYPE: CHANNEL_TYPE_TUBES,
+ assert ({CHANNEL_TYPE: CHANNEL_TYPE_STREAM_TUBE,
TARGET_HANDLE_TYPE: HT_ROOM},
- [TARGET_HANDLE, TARGET_ID],
+ [TARGET_HANDLE, TARGET_ID, STREAM_TUBE_SERVICE],
) in properties.get('RequestableChannelClasses'),\
properties['RequestableChannelClasses']