[telepathy-gabble/master] Only run tests that add/remove streams on protocols that can do so

Sjoerd Simons sjoerd.simons at collabora.co.uk
Thu Jun 25 09:59:43 PDT 2009


---
 tests/twisted/jingle/hold-av.py     |    3 ++-
 tests/twisted/jingle/jingletest2.py |    6 ++++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/tests/twisted/jingle/hold-av.py b/tests/twisted/jingle/hold-av.py
index 8e7686c..1977ea9 100644
--- a/tests/twisted/jingle/hold-av.py
+++ b/tests/twisted/jingle/hold-av.py
@@ -462,7 +462,8 @@ def test(jp, q, bus, conn, stream):
     sync_stream(q, stream)
     q.unforbid_events(hold_event + active_event)
 
-    mutable_stream_tests(jp, jt, q, bus, conn, stream,
+    if jp.has_mutable_streams():
+        mutable_stream_tests(jp, jt, q, bus, conn, stream,
             media_iface, hold_iface, handle)
 
     # ---- The end ----
diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 9cce1c2..74bf807 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -123,6 +123,9 @@ class JingleProtocol:
     def seperate_contents(self):
         return True
 
+    def has_mutable_streams(self):
+        return True
+
     def is_modern_jingle(self):
         return False
 
@@ -224,6 +227,9 @@ class GtalkProtocol03(JingleProtocol):
     def seperate_contents(self):
         return False
 
+    def has_mutable_streams(self):
+        return False
+
 class GtalkProtocol04(JingleProtocol):
     features = [ 'http://www.google.com/xmpp/protocol/voice/v1',
           'http://www.google.com/transport/p2p' ]
-- 
1.5.6.5




More information about the telepathy-commits mailing list