[telepathy-gabble/master] Just check that InitialAudio/Video are in RCC

Will Thompson will.thompson at collabora.co.uk
Wed Apr 22 05:22:59 PDT 2009


A more thorough check is now in outgoing-basics; the previous check here
would break whenever we add more allowed properties, which is bad.
---
 tests/twisted/jingle/initial-audio-video.py |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/jingle/initial-audio-video.py b/tests/twisted/jingle/initial-audio-video.py
index 31e8b36..f7b43e3 100644
--- a/tests/twisted/jingle/initial-audio-video.py
+++ b/tests/twisted/jingle/initial-audio-video.py
@@ -22,14 +22,13 @@ def outgoing(jp, q, bus, conn, stream):
     remote_handle = conn.RequestHandles(cs.HT_CONTACT, [remote_jid])[0]
 
     rccs = conn.Properties.Get(cs.CONN_IFACE_REQUESTS, 'RequestableChannelClasses')
-    cclass = ({ cs.CHANNEL_TYPE: cs.CHANNEL_TYPE_STREAMED_MEDIA,
-                cs.TARGET_HANDLE_TYPE: cs.HT_CONTACT,
-              },
-              [ cs.TARGET_HANDLE, cs.TARGET_ID,
-                cs.INITIAL_AUDIO, cs.INITIAL_VIDEO,
-              ]
-             )
-    assertContains(cclass, rccs)
+    media_classes = [ rcc for rcc in rccs
+        if rcc[0][cs.CHANNEL_TYPE] == cs.CHANNEL_TYPE_STREAMED_MEDIA ]
+
+    assertLength(1, media_classes)
+    fixed, allowed = media_classes[0]
+    assertContains(cs.INITIAL_AUDIO, allowed)
+    assertContains(cs.INITIAL_VIDEO, allowed)
 
     check_neither(q, conn, bus, stream, remote_handle)
     check_iav(jt, q, conn, bus, stream, remote_handle, True, False)
-- 
1.5.6.5




More information about the telepathy-commits mailing list