Changes: Fixing the failing test test_daemon

RevBy: TrustMe

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

@@ -325,16 +325,14 @@ class launcher_tests (unittest.TestCase):
 
         stop_applauncherd()
 
-        # and for the fun of it let's do it again
-        commands.getstatusoutput("pkill applauncherd")
-
         remove_applauncherd_runtime_files()
 
         p = run_cmd_as_user('/usr/bin/applauncherd.bin --daemon')
 
-        time.sleep(10)
+        time.sleep(5)
 
         st, op = commands.getstatusoutput('pgrep -lf "applauncherd.bin --daemon"')
+        p_id = op.split(" ")[0]
         debug("The pid of applauncherd --daemon is %s" %op)
 
         # filter some cruft out from the output and see how many
@@ -358,7 +356,8 @@ class launcher_tests (unittest.TestCase):
             self.assert_(False, "fala_ft_hello was not launched!")
 
         # only the daemonized applauncherd should be running now
-        commands.getstatusoutput('pkill applauncherd')
+        kill_process(apppid = p_id)
+        #commands.getstatusoutput('pkill applauncherd')
 
         remove_applauncherd_runtime_files()
 

tests/harmattan/testscripts/utils.py

@@ -45,7 +45,7 @@ def start_applauncherd():
                    stdout = DEV_NULL, stderr = DEV_NULL,
                    shell = False)
 
-    time.sleep(4)
+    time.sleep(6)
     return handle.wait() == 0
 
 def stop_applauncherd():