[tracker/functional-test-fixes-bug-696172: 2/8] functional-tests: Don't rely on just tracker-control -t to kill tests in time



commit 9a6d534705c57471c2db21462c5ec107ea9bb224
Author: Martin Kampas <martin kampas+gnomebugs ubedi net>
Date:   Mon Feb 24 16:05:32 2014 +0000

    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.

 tests/functional-tests/create-tests-xml.py |    2 +-
 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 11835b9..d297854 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>
         """
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]