[telepathy-gabble/master] Rename supports_termination_reason to is_modern_jingle

Will Thompson will.thompson at collabora.co.uk
Fri Mar 27 11:07:17 PDT 2009


---
 tests/twisted/jingle/jingletest2.py                |    6 +++---
 tests/twisted/jingle/test-incoming-call-reject.py  |    2 +-
 .../twisted/jingle/test-outgoing-call-rejected.py  |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 2d02411..215e764 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -109,7 +109,7 @@ class JingleProtocol:
     def extract_session_id(self, query):
         return query['sid']
 
-    def supports_termination_reason(self):
+    def is_modern_jingle(self):
         return False
 
 class GtalkProtocol03(JingleProtocol):
@@ -249,7 +249,7 @@ class JingleProtocol031(JingleProtocol):
         return ('description', 'urn:xmpp:jingle:apps:rtp:0',
             { 'media': type }, children)
 
-    def supports_termination_reason(self):
+    def is_modern_jingle(self):
         return True
 
 
@@ -353,7 +353,7 @@ class JingleTest2:
     def terminate(self, reason=None):
         jp = self.jp
 
-        if reason is not None and jp.supports_termination_reason():
+        if reason is not None and jp.is_modern_jingle():
             body = [("reason", None, {}, [(reason, None, {}, [])])]
         else:
             body = []
diff --git a/tests/twisted/jingle/test-incoming-call-reject.py b/tests/twisted/jingle/test-incoming-call-reject.py
index ad79cd2..58b146a 100644
--- a/tests/twisted/jingle/test-incoming-call-reject.py
+++ b/tests/twisted/jingle/test-incoming-call-reject.py
@@ -93,7 +93,7 @@ def test(jp, q, bus, conn, stream, busy):
     else:
         assert reason == cs.GC_REASON_NONE, reason
 
-    if jp.supports_termination_reason():
+    if jp.is_modern_jingle():
         jingle = iq.query
         if busy:
             r = "/jingle/reason/busy"
diff --git a/tests/twisted/jingle/test-outgoing-call-rejected.py b/tests/twisted/jingle/test-outgoing-call-rejected.py
index 75c9a0c..22ef2df 100644
--- a/tests/twisted/jingle/test-outgoing-call-rejected.py
+++ b/tests/twisted/jingle/test-outgoing-call-rejected.py
@@ -57,7 +57,7 @@ def test(jp, q, bus, conn, stream):
     assert lp == [], lp
     assert rp == [], rp
     assert actor == remote_handle, (actor, remote_handle)
-    if jp.supports_termination_reason():
+    if jp.is_modern_jingle():
         assert reason == cs.GC_REASON_BUSY, reason
 
     q.expect('dbus-signal', signal='Close') #XXX - match against the path
-- 
1.5.6.5




More information about the telepathy-commits mailing list