[tracker] functional-tests: Remove process watch before killing process

[Carlos Garnacho <carlosg src gnome org>]

commit b14f45d647c9de19ca35fcc74255b2de85cb722b
Author: Carlos Garnacho <carlosg gnome org>
Date:   Sun Sep 30 15:31:17 2018 +0200

    functional-tests: Remove process watch before killing process
    
    This sometimes causes spurious errors in 12-transactions because
    the GSource gets activated somewhere between the process being
    restarted, causing failures and logs like:
    
    RuntimeError: tracker-store exited with status: -9

 tests/functional-tests/common/utils/helpers.py | 4 ++++
 1 file changed, 4 insertions(+)
---
diff --git a/tests/functional-tests/common/utils/helpers.py b/tests/functional-tests/common/utils/helpers.py
index 2b328846f..90d3e9c1a 100644
--- a/tests/functional-tests/common/utils/helpers.py
+++ b/tests/functional-tests/common/utils/helpers.py
@@ -198,6 +198,10 @@ class Helper:
             log ("kill(): ignoring, because process was started manually.")
             return
 
+        if self.process_watch_timeout != 0:
+            GLib.source_remove(self.process_watch_timeout)
+            self.process_watch_timeout = 0
+
         self.process.kill ()
 
         # Name owner changed callback should take us out from this loop