[Pkg-telepathy-commits] [telepathy-mission-control-6] 41/280: capabilities test: emulate Call1, not MediaSignalling

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian
in repository telepathy-mission-control-6.

commit 684a5fc4fcd3d77adeeea71dea1637a8988f17cd
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Wed Oct 2 20:27:25 2013 +0100

    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 at collabora.co.uk>
---
 tests/twisted/capabilities/contact-caps.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/twisted/capabilities/contact-caps.py b/tests/twisted/capabilities/contact-caps.py
index 3184c86..7c49fcd 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-6.git