[telepathy-gabble/master] remove exec_tests()

Dafydd Harries dafydd.harries at collabora.co.uk
Tue Sep 8 03:33:25 PDT 2009


It was broken and nothing used it.
---
 tests/twisted/gabbletest.py |   18 ++++++------------
 1 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/tests/twisted/gabbletest.py b/tests/twisted/gabbletest.py
index b25464f..dce3bfe 100644
--- a/tests/twisted/gabbletest.py
+++ b/tests/twisted/gabbletest.py
@@ -379,7 +379,7 @@ def disconnect_conn(q, conn, stream, expected=[]):
     q.expect('dbus-return', method='Disconnect')
     return events[:-2]
 
-def exec_test_deferred(funs, params, protocol=None, timeout=None,
+def exec_test_deferred(fun, params, protocol=None, timeout=None,
                         authenticator=None):
     # hack to ease debugging
     domish.Element.__repr__ = domish.Element.toXml
@@ -394,7 +394,7 @@ def exec_test_deferred(funs, params, protocol=None, timeout=None,
         or '-v' in sys.argv)
 
     bus = dbus.SessionBus()
-    # conn = make_connection(bus, queue.append, params)
+    conn = make_connection(bus, queue.append, params)
     resource = params.get('resource') if params is not None else None
     (stream, port) = make_stream(queue.append, protocol=protocol,
         authenticator=authenticator, resource=resource)
@@ -402,9 +402,7 @@ def exec_test_deferred(funs, params, protocol=None, timeout=None,
     error = None
 
     try:
-        for f in funs:
-            conn = make_connection(bus, queue.append, params)
-            f(queue, bus, conn, stream)
+        fun(queue, bus, conn, stream)
     except Exception, e:
         traceback.print_exc()
         error = e
@@ -435,15 +433,11 @@ def exec_test_deferred(funs, params, protocol=None, timeout=None,
     except dbus.DBusException, e:
         pass
 
-def exec_tests(funs, params=None, protocol=None, timeout=None,
-               authenticator=None):
-    reactor.callWhenRunning(
-        exec_test_deferred, funs, params, protocol, timeout, authenticator)
-    reactor.run()
-
 def exec_test(fun, params=None, protocol=None, timeout=None,
               authenticator=None):
-  exec_tests([fun], params, protocol, timeout, authenticator)
+    reactor.callWhenRunning(
+        exec_test_deferred, fun, params, protocol, timeout, authenticator)
+    reactor.run()
 
 # Useful routines for server-side vCard handling
 current_vcard = domish.Element(('vcard-temp', 'vCard'))
-- 
1.5.6.5




More information about the telepathy-commits mailing list