[Telepathy-commits] [telepathy-gabble/master] gabbletest.py/servicetest.py: pass in bus to prepare_test rather than creating it there

[Dafydd Harries]

20080506232345-c9803-3e9cf25493b7c76ba11dd8876affbd2d80e36fa9.gz
---
 tests/twisted/gabbletest.py  |   15 +++++++++------
 tests/twisted/servicetest.py |    5 ++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tests/twisted/gabbletest.py b/tests/twisted/gabbletest.py
index b94bfbd..358d41b 100644
--- a/tests/twisted/gabbletest.py
+++ b/tests/twisted/gabbletest.py
@@ -204,7 +204,8 @@ class JabberXmlStream(BaseXmlStream):
 class XmppXmlStream(BaseXmlStream):
     version = (1, 0)
 
-def prepare_test(event_func, params=None, authenticator=None, protocol=None):
+def prepare_test(bus, event_func, params=None, authenticator=None,
+        protocol=None):
     default_params = {
         'account': 'test at localhost/Resource',
         'password': 'pass',
@@ -216,7 +217,7 @@ def prepare_test(event_func, params=None, authenticator=None, protocol=None):
     if params:
         default_params.update(params)
 
-    bus, conn = servicetest.prepare_test(event_func, 'gabble', 'jabber',
+    conn = servicetest.prepare_test(bus, event_func, 'gabble', 'jabber',
         default_params)
 
     # set up Jabber server
@@ -231,15 +232,16 @@ def prepare_test(event_func, params=None, authenticator=None, protocol=None):
     factory = twisted.internet.protocol.Factory()
     factory.protocol = lambda *args: stream
     reactor.listenTCP(4242, factory)
-    return bus, conn, stream
+    return conn, stream
 
 def go(params=None, authenticator=None, protocol=None, start=None):
     # hack to ease debugging
     domish.Element.__repr__ = domish.Element.toXml
 
+    bus = dbus.SessionBus()
     handler = servicetest.EventTest()
-    bus, conn, stream = \
-        prepare_test(handler.handle_event, params, authenticator, protocol)
+    conn, stream = \
+        prepare_test(bus, handler.handle_event, params, authenticator, protocol)
     handler.data = {
         'bus': bus,
         'conn': conn,
@@ -290,7 +292,8 @@ def exec_test(fun, params=None, protocol=None, timeout=None):
     if '-v' in sys.argv:
         queue.verbose = True
 
-    bus, conn, stream = prepare_test(queue.append, params, protocol=protocol)
+    bus = dbus.SessionBus()
+    conn, stream = prepare_test(bus, queue.append, params, protocol=protocol)
 
     # hack to ease debugging
     domish.Element.__repr__ = domish.Element.toXml
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index ecb44f6..f9dfc81 100644
--- a/tests/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
@@ -381,8 +381,7 @@ class ProxyWrapper:
 
         return getattr(self.default_interface, name)
 
-def prepare_test(event_func, name, proto, params):
-    bus = dbus.SessionBus()
+def prepare_test(bus, event_func, name, proto, params):
     cm = bus.get_object(
         tp_name_prefix + '.ConnectionManager.%s' % name,
         tp_path_prefix + '/ConnectionManager/%s' % name)
@@ -411,7 +410,7 @@ def prepare_test(event_func, name, proto, params):
         byte_arrays=True
         )
 
-    return bus, conn
+    return conn
 
 def make_channel_proxy(conn, path, iface):
     bus = dbus.SessionBus()
-- 
1.5.6.3