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

[Carlos Garnacho <carlosg src gnome org>]

commit c8f9a2b8a170664e152075e36c30b15a2fc29425
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.

 tests/functional-tests/common/utils/helpers.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/tests/functional-tests/common/utils/helpers.py b/tests/functional-tests/common/utils/helpers.py
index 6e5c26c40..42a550498 100644
--- a/tests/functional-tests/common/utils/helpers.py
+++ b/tests/functional-tests/common/utils/helpers.py
@@ -176,11 +176,12 @@ class Helper:
             # Seems that it didn't even start...
             return
 
-        start = time.time()
-        if self.process.poll() == None:
+        if self.process_watch_timeout != 0:
             GLib.source_remove(self.process_watch_timeout)
             self.process_watch_timeout = 0
 
+        start = time.time()
+        if self.process.poll() == None:
             self.process.terminate()
 
             while self.process.poll() == None: