summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-07-09 18:11:55 +0200
committerCarlos Garnacho <carlosg@gnome.org>2019-09-10 00:22:58 +0200
commit980c039bb104e592f6db2f9a6028751c73df0771 (patch)
tree472e8a4eec03813f5c7a055dfe1eecb955f1aa4e /utils
parent92728c8273e31427161b81e15613a4bea6b54919 (diff)
downloadtracker-980c039bb104e592f6db2f9a6028751c73df0771.tar.gz
functional-tests: Remove timeout on all situations that exists
There may be a timeout id without a .poll(), so make sure we don't leave the idle function running.
Diffstat (limited to 'utils')
-rw-r--r--utils/trackertestutils/helpers.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/trackertestutils/helpers.py b/utils/trackertestutils/helpers.py
index 2b218e5d0..e6219be3c 100644
--- a/utils/trackertestutils/helpers.py
+++ b/utils/trackertestutils/helpers.py
@@ -175,10 +175,11 @@ class Helper:
# Seems that it didn't even start...
return
- if self.process.poll() == None:
+ if self.process_startup_timeout != 0:
GLib.source_remove(self.process_startup_timeout)
self.process_startup_timeout = 0
+ if self.process.poll() == None:
self.process.terminate()
returncode = self.process.wait(timeout=self.SHUTDOWN_TIMEOUT * 1000)
if returncode is None: