summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@debian.org>2018-05-08 09:09:42 +0100
committerSimon McVittie <smcv@collabora.com>2018-05-09 08:53:17 +0100
commitd4732fae047c2d6532ad8049ae0edc2fb3480fe2 (patch)
tree8e7dbbf701168a6e26005d600fddf59a8adf6527
parenta4a5a0526d7a4c9465a5e97b5f459c0922953e9e (diff)
cross-test-client: Wait until default method timeout for Exit()
On a slow machine under load, communication might legitimately take time. After the default method-call timeout (25 seconds) we'll go into quit_error_handler() and exit anyway. Bug-Debian: https://bugs.debian.org/898158
-rwxr-xr-xtest/cross-test-client.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/test/cross-test-client.py b/test/cross-test-client.py
index 48ab5c7..cc96023 100755
--- a/test/cross-test-client.py
+++ b/test/cross-test-client.py
@@ -70,8 +70,6 @@ class Client(SignalTestsImpl):
logger.error(s)
logger.info("asking server to Exit")
Interface(self.obj, INTERFACE_TESTS).Exit(reply_handler=self.quit_reply_handler, error_handler=self.quit_error_handler)
- # if the server doesn't reply we'll just exit anyway
- gobject.timeout_add(1000, lambda: (loop.quit(), False)[1])
def quit_reply_handler(self):
logger.info("server says it will exit")