[Telepathy-commits] [telepathy-gabble/master] rename BytestreamSIFallback to BytestreamSIFallbackS5CannotConnect

Guillaume Desmottes guillaume.desmottes at collabora.co.uk
Tue Mar 17 09:43:14 PDT 2009


---
 tests/twisted/bytestream.py         |    4 +++-
 tests/twisted/tubes/tubetestutil.py |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/twisted/bytestream.py b/tests/twisted/bytestream.py
index f93fe31..9f82660 100644
--- a/tests/twisted/bytestream.py
+++ b/tests/twisted/bytestream.py
@@ -446,7 +446,9 @@ def parse_ibb_msg_data(message):
 
 ##### SI Fallback (Gabble specific extension) #####
 
-class BytestreamSIFallback(Bytestream):
+class BytestreamSIFallbackS5CannotConnect(Bytestream):
+    """Try to use SOCKS5 and fallback to IBB because the target can't connect
+    to the receiver."""
     def __init__(self, stream, q, sid, initiator, target, initiated):
         Bytestream.__init__(self, stream, q, sid, initiator, target, initiated)
 
diff --git a/tests/twisted/tubes/tubetestutil.py b/tests/twisted/tubes/tubetestutil.py
index c41509b..d3df579 100644
--- a/tests/twisted/tubes/tubetestutil.py
+++ b/tests/twisted/tubes/tubetestutil.py
@@ -11,7 +11,7 @@ from dbus import PROPERTIES_IFACE
 from servicetest import unwrap
 from gabbletest import exec_test
 from constants import *
-from bytestream import BytestreamIBB, BytestreamS5B, BytestreamSIFallback
+from bytestream import BytestreamIBB, BytestreamS5B, BytestreamSIFallbackS5CannotConnect
 
 from twisted.internet import reactor
 from twisted.internet.protocol import Factory, Protocol
@@ -227,7 +227,7 @@ def exec_tube_test(test):
         test(q, bus, conn, stream, BytestreamS5B)
 
     def test_si_fallback(q, bus, conn, stream):
-        test(q, bus, conn, stream, BytestreamSIFallback)
+        test(q, bus, conn, stream, BytestreamSIFallbackS5CannotConnect)
 
     exec_test(test_ibb)
     exec_test(test_socks5)
-- 
1.5.6.5




More information about the telepathy-commits mailing list