[tracker/wip/carlosg/sparql1.1: 156/201] functional-tests: Remove timeout on all situations that exists

[Carlos Garnacho <carlosg src gnome org>]

commit 980c039bb104e592f6db2f9a6028751c73df0771
Author: Carlos Garnacho <carlosg gnome org>
Date:   Tue Jul 9 18:11:55 2019 +0200

    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.

 utils/trackertestutils/helpers.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
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: