[telepathy-gabble/master] gabbletest.py: exec_test_deferred: wait for the StatusChanged signal when disconnecting
Guillaume Desmottes
guillaume.desmottes at collabora.co.uk
Mon Jul 13 07:36:29 PDT 2009
---
tests/twisted/gabbletest.py | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/tests/twisted/gabbletest.py b/tests/twisted/gabbletest.py
index 292446b..87e44d2 100644
--- a/tests/twisted/gabbletest.py
+++ b/tests/twisted/gabbletest.py
@@ -400,7 +400,14 @@ def exec_test_deferred (funs, params, protocol=None, timeout=None,
# please ignore the POSIX behind the curtain
d.addBoth((lambda *args: os._exit(1)))
- conn.Disconnect()
+ try:
+ conn.Disconnect()
+ except dbus.DBusException, e:
+ # Connection has already been disconnected
+ pass
+ else:
+ queue.expect('dbus-signal', signal='StatusChanged',
+ args=[cs.CONN_STATUS_DISCONNECTED, cs.CSR_REQUESTED])
except dbus.DBusException, e:
pass
--
1.5.6.5
More information about the telepathy-commits
mailing list