[telepathy-mission-control/master] mctest: add support for not pre-loading MC

[Simon McVittie]

This means tests can do some setup, *then* run MC.
---
 test/twisted/mctest.py |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/twisted/mctest.py b/test/twisted/mctest.py
index d7e2b5f..e7e9f65 100644
--- a/test/twisted/mctest.py
+++ b/test/twisted/mctest.py
@@ -50,7 +50,8 @@ def install_colourer():
     return sys.stdout
 
 
-def exec_test_deferred (fun, params, protocol=None, timeout=None):
+def exec_test_deferred (fun, params, protocol=None, timeout=None,
+        preload_mc=True):
     colourer = None
 
     if sys.stdout.isatty():
@@ -63,7 +64,10 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None):
 
     bus = dbus.SessionBus()
     queue.attach_to_bus(bus)
-    mc = make_mc(bus, queue.append, params)
+    if preload_mc:
+        mc = make_mc(bus, queue.append, params)
+    else:
+        mc = None
     error = None
 
     try:
@@ -119,8 +123,9 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None):
     if colourer:
       sys.stdout = colourer.fh
 
-def exec_test(fun, params=None, protocol=None, timeout=None):
-  reactor.callWhenRunning (exec_test_deferred, fun, params, protocol, timeout)
+def exec_test(fun, params=None, protocol=None, timeout=None, preload_mc=True):
+  reactor.callWhenRunning (exec_test_deferred, fun, params, protocol, timeout,
+          preload_mc)
   reactor.run()
 
 class SimulatedConnection(object):
-- 
1.5.6.5