[next] telepathy-idle: Don' t try to sync_dbus by talking to a Connection that just closed

Simon McVittie smcv at kemper.freedesktop.org
Thu Apr 3 07:32:27 PDT 2014


Module: telepathy-idle
Branch: next
Commit: 0dc997bac6c45573c417e5cf2f62e65db54bb21f
URL:    http://cgit.freedesktop.org/telepathy/telepathy-idle/commit/?id=0dc997bac6c45573c417e5cf2f62e65db54bb21f

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Mon Mar 24 18:33:50 2014 +0000

Don't try to sync_dbus by talking to a Connection that just closed

The ConnectionManager should still exist, so use that instead.

---

 tests/twisted/connect/disconnect-during-cert-verification.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tests/twisted/connect/disconnect-during-cert-verification.py b/tests/twisted/connect/disconnect-during-cert-verification.py
index a8c7957..0c742f2 100644
--- a/tests/twisted/connect/disconnect-during-cert-verification.py
+++ b/tests/twisted/connect/disconnect-during-cert-verification.py
@@ -8,6 +8,9 @@ from idletest import exec_test, SSLIRCServer
 from servicetest import EventPattern, sync_dbus
 
 def test(q, bus, conn, stream):
+    cm = bus.get_object(cs.CM + '.idle',
+            '/' + cs.CM.replace('.', '/') + '/idle')
+
     conn.Connect()
     q.expect_many(
             EventPattern('dbus-signal', signal='StatusChanged', args=[1, 1]),
@@ -21,7 +24,7 @@ def test(q, bus, conn, stream):
             )
 
     # Idle would now crash in an idle callback; so let's see if it's alive.
-    sync_dbus(bus, q, conn)
+    sync_dbus(bus, q, cm)
 
 if __name__ == '__main__':
     exec_test(test, {'use-ssl':dbus.Boolean(True)}, protocol=SSLIRCServer)



More information about the telepathy-commits mailing list