From 125e20be13a2cbf61e2835b416ea903f318511f3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Wed, 2 Oct 2013 20:27:25 +0100 Subject: [PATCH 2/6] capabilities test: emulate Call1, not MediaSignalling MediaSignalling is dead, long live Call1. --- 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 -- 1.8.4.rc3