Merge branch 'master' of ssh://gitorious.org/meegotouch/meegotouch-applauncherd

tests/common/unittests/ut_logger/ut_logger.cpp

@@ -120,6 +120,7 @@ void Ut_Logger::testOpenLogTwice() {
 
 bool Ut_Logger::_findPhraseInSyslog()
 {
+    QTest::qSleep(delay);
     int exitCode = QProcess::execute("grep", QStringList() << QString(m_testPhrase) << syslogFile);
     return exitCode == 0;
 }

tests/harmattan/functests/tests.xml

@@ -73,7 +73,7 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_one_instance_m</step>
       </case>
 
-      <case name="applauncherd__test_fd_booster_m" type="Functional" description="File descriptor test for booster-m" timeout="360" level="System" insignificant="false">
+      <case name="applauncherd__test_fd_booster_m" type="Functional" description="File descriptor test for booster-m" timeout="560" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_m</step>
       </case>
       <case name="applauncherd__test_qttas_load_booster_m" type="Functional" description="To test invoker that qttestability plugin is loaded with -testability argument for booster-m" timeout="360" level="System" insignificant="false">
@@ -112,7 +112,7 @@
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
 
-      <case name="applauncherd__test_fd_booster_q" type="Functional" description="File descriptor test for booster-q" timeout="360" level="System" insignificant="false">
+      <case name="applauncherd__test_fd_booster_q" type="Functional" description="File descriptor test for booster-q" timeout="560" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_q</step>
       </case>
 
@@ -153,7 +153,7 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-invoker.py test_wait_term_qml</step>
       </case>
 
-      <case name="applauncherd__test_fd_booster_d" type="Functional" description="File descriptor test for booster-d" timeout="360" level="System" insignificant="false">
+      <case name="applauncherd__test_fd_booster_d" type="Functional" description="File descriptor test for booster-d" timeout="560" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_d</step>
       </case>
       <case name="applauncherd__test_qttas_load_booster_d" type="Functional" description="To test invoker that qttestability plugin is loaded with -testability argument for booster-d" timeout="360" level="System" insignificant="false">
@@ -210,7 +210,7 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_one_instance_e</step>
       </case>
 
-      <case name="applauncherd__test_fd_booster_e" type="Functional" description="File descriptor test for booster-d" timeout="360" level="System" insignificant="false">
+      <case name="applauncherd__test_fd_booster_e" type="Functional" description="File descriptor test for booster-d" timeout="560" level="System" insignificant="false">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_e</step>
       </case>
       <case name="applauncherd__test_dirPath_filePath_e" type="Functional" description="Test that correct file path and dir path is passed by booster e" timeout="360" level="System" insignificant="false">

tests/harmattan/testscripts/test-func-launcher.py

@@ -247,7 +247,7 @@ class launcher_tests (unittest.TestCase):
             #in a global dictionary, append the pid
             process_handle = run_app_as_user_with_invoker(app, booster = btype)
 
-        time.sleep(8)
+        time.sleep(15)
 
         process_id = get_pid(app_common_prefix)
         pid_list = process_id.split()