summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Kampas <martin.kampas+gnomebugs@ubedi.net>2014-02-24 16:05:32 +0000
committerMartyn Russell <martyn@lanedo.com>2014-02-24 16:31:32 +0000
commitf9b846e6836ead799532f7309b43076bc21ccb15 (patch)
treebb0308cf04a9148a6d6186d0280167d096aa30c9
parentc7ebf4a6caad380e150899ac608f25e7cb1f432d (diff)
downloadtracker-f9b846e6836ead799532f7309b43076bc21ccb15.tar.gz
functional-tests: Don't rely on just tracker-control -t to kill tests in time
The command `tracker-control -t` simply kill(2) all tracker processes and exits. It does not wait/check the processes to terminate. In some test cases it happens that the test case tries to launch its own instance of some tracker process, but it fails because the old process is still there.
-rwxr-xr-xtests/functional-tests/create-tests-xml.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/functional-tests/create-tests-xml.py b/tests/functional-tests/create-tests-xml.py
index 11835b953..d29785496 100755
--- a/tests/functional-tests/create-tests-xml.py
+++ b/tests/functional-tests/create-tests-xml.py
@@ -52,7 +52,7 @@ if (cfg.haveUpstart):
"""
else:
PRE_STEPS = """ <pre_steps>
- <step>tracker-control -t</step>
+ <step>while tracker-control -p |grep -q '^Found process ID '; do tracker-control -t; sleep 1; done</step>
</pre_steps>
"""