[Telepathy-commits] [telepathy-salut/master] Don't make an initial stream

[Sjoerd Simons]

---
 tests/twisted/saluttest.py |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/tests/twisted/saluttest.py b/tests/twisted/saluttest.py
index 8865e94..0e85969 100644
--- a/tests/twisted/saluttest.py
+++ b/tests/twisted/saluttest.py
@@ -67,12 +67,10 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None):
 
     bus = dbus.SessionBus()
     conn = make_connection(bus, queue.append, params)
-    (stream, port) = make_stream(queue.append, protocol=protocol)
-
     error = None
 
     try:
-        fun(queue, bus, conn, stream)
+        fun(queue, bus, conn)
     except Exception, e:
         import traceback
         traceback.print_exc()
@@ -81,16 +79,14 @@ def exec_test_deferred (fun, params, protocol=None, timeout=None):
     try:
         if colourer:
           sys.stdout = colourer.fh
-        d = port.stopListening()
+
         if error is None:
-            d.addBoth((lambda *args: reactor.crash()))
+          reactor.stop()
         else:
-            # please ignore the POSIX behind the curtain
-            d.addBoth((lambda *args: os._exit(1)))
+          # please ignore the POSIX behind the curtain
+          os._exit(1)
 
         conn.Disconnect()
-        # second call destroys object
-        conn.Disconnect()
     except dbus.DBusException, e:
         pass
 
-- 
1.5.6.3