summaryrefslogtreecommitdiff
path: root/tests/twisted
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-02 20:27:25 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-04 12:32:29 +0100
commit684a5fc4fcd3d77adeeea71dea1637a8988f17cd (patch)
tree0ddb80293b361e4ce4aa3bbc919a7c4185dd7b59 /tests/twisted
parent91ddc725a21e3e5c56d0010cc91fdd9cc3c92ddf (diff)
capabilities test: emulate Call1, not MediaSignalling
MediaSignalling is dead, long live Call1. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54879 Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'tests/twisted')
-rw-r--r--tests/twisted/capabilities/contact-caps.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/twisted/capabilities/contact-caps.py b/tests/twisted/capabilities/contact-caps.py
index 3184c867..7c49fcd6 100644
--- a/tests/twisted/capabilities/contact-caps.py
+++ b/tests/twisted/capabilities/contact-caps.py
@@ -60,9 +60,9 @@ def test(q, bus, mc):
}, signature='sv')
media_call = SimulatedClient(q, bus, 'MediaCall',
observe=[], approve=[], handle=[media_fixed_properties],
- cap_tokens=[cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/ice-udp',
- cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/audio/speex',
- cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/video/theora'],
+ cap_tokens=[cs.CHANNEL_TYPE_CALL + '/ice',
+ cs.CHANNEL_TYPE_CALL + '/audio/speex',
+ cs.CHANNEL_TYPE_CALL + '/video/theora'],
bypass_approval=False)
# wait for MC to download the properties
@@ -89,11 +89,11 @@ def test(q, bus, mc):
assert len(filters[cs.CLIENT + '.AbiWord']) == 2
assert len(tokens[cs.CLIENT + '.MediaCall']) == 3
- assert cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/ice-udp' in \
+ assert cs.CHANNEL_TYPE_CALL + '/ice' in \
tokens[cs.CLIENT + '.MediaCall']
- assert cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/audio/speex' in \
+ assert cs.CHANNEL_TYPE_CALL + '/audio/speex' in \
tokens[cs.CLIENT + '.MediaCall']
- assert cs.CHANNEL_IFACE_MEDIA_SIGNALLING + '/video/theora' in \
+ assert cs.CHANNEL_TYPE_CALL + '/video/theora' in \
tokens[cs.CLIENT + '.MediaCall']
assert len(tokens[cs.CLIENT + '.AbiWord']) == 2