From 32d4b3b8f7a41d6089ee2429ec062698952b19ab Mon Sep 17 00:00:00 2001
From: Nimika Keshri <nimika.1.keshri@nokia.com>
Date: Thu, 27 Jan 2011 15:06:21 +0200
Subject: [PATCH] Changes: Disabled perf test using visibility signals         
 Other minor changes to fix tests failures RevBy: TrustMe

---
 tests/Harmattan/TestScripts/test-func-launcher.py | 6 ++++--
 tests/Harmattan/bug-tests/tests.xml               | 2 +-
 tests/Harmattan/perftests/tests.xml               | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tests/Harmattan/TestScripts/test-func-launcher.py b/tests/Harmattan/TestScripts/test-func-launcher.py
index 1664349..7a403b4 100644
--- a/tests/Harmattan/TestScripts/test-func-launcher.py
+++ b/tests/Harmattan/TestScripts/test-func-launcher.py
@@ -709,7 +709,9 @@ class launcher_tests (unittest.TestCase):
 
     def test_stress_boosted_apps(self):
         self._test_stress_boosted_apps('m', 'fala_ft_hello')
+        time.sleep(5)
         self._test_stress_boosted_apps('d', 'fala_qml_helloworld', invoker_extra_flags='--single-instance')
+        time.sleep(5)
 
     def _test_stress_boosted_apps(self, booster_type, app_name, invoker_extra_flags=''):
         """
@@ -748,7 +750,7 @@ class launcher_tests (unittest.TestCase):
         time.sleep(2)
         pid = get_pid('fala_wl')
         st, op = commands.getstatusoutput('cat /proc/%s/cmdline' %pid)
-        self.assert_(op.split('0')[0] == "fala_wl.launch",'Application name is incorrect')    
+        self.assert_(op.split('\0')[0] == "fala_wl.launch",'Application name is incorrect')    
     
         #check through the window property
         st, op = commands.getstatusoutput("xwininfo -root -tree| awk '/Applauncherd testapp/ {print $1}'")
@@ -776,7 +778,7 @@ class launcher_tests (unittest.TestCase):
         time.sleep(2)
         pid = get_pid('fala_wl')
         st, op = commands.getstatusoutput('cat /proc/%s/cmdline' %pid)
-        self.assert_(op.split('0')[0] == "fala_wl.launch",'Application name is incorrect')    
+        self.assert_(op.split('\0')[0] == "fala_wl.launch",'Application name is incorrect')    
     
         #check through the window property
         st, op = commands.getstatusoutput("xwininfo -root -tree| awk '/Applauncherd testapp/ {print $1}'")
diff --git a/tests/Harmattan/bug-tests/tests.xml b/tests/Harmattan/bug-tests/tests.xml
index 17b9e54..92d079d 100644
--- a/tests/Harmattan/bug-tests/tests.xml
+++ b/tests/Harmattan/bug-tests/tests.xml
@@ -46,7 +46,7 @@
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_invoker_bogus_apptype</step>
       </case>
 
-      <case name="applauncherd__test_launch_prestarted_app" type="Functional" description="To test that prestarted application is launched" timeout="900" level="System" insignificant="true">
+      <case name="applauncherd__test_launch_prestarted_app" type="Functional" description="To test that prestarted application is launched" timeout="1500" level="System" insignificant="true">
           <step expected_result="0">source /tmp/session_bus_address.user; DISPLAY=:0  /usr/share/applauncherd-testscripts/ts_prestartapp.rb --name test_launch_prestarted_app</step>
       </case>
 
diff --git a/tests/Harmattan/perftests/tests.xml b/tests/Harmattan/perftests/tests.xml
index 8579b04..d1a36a5 100644
--- a/tests/Harmattan/perftests/tests.xml
+++ b/tests/Harmattan/perftests/tests.xml
@@ -5,7 +5,7 @@
   <!-- Schema: https://projects.maemo.org/docs/testing/xml-definition.html -->
   <suite name="applauncherd-performance-tests" domain="Application framework"> 
 
-    <set name="test-commandline" description="Applauncherd application startup time from command line with Python" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
+    <!--set name="test-commandline" description="Applauncherd application startup time from command line with Python" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>
           <step>/usr/bin/waitloadavg.rb -l 1.0 -p 1.0 -t 120</step>
       </pre_steps>
@@ -22,7 +22,7 @@
       <get>
           <file>/tmp/launcher_perf.txt</file>
       </get>
-    </set>
+    </set-->
 
     <set name="test-command-line2" description="Application startup time from command line" feature="AF DUI Booster for Launcher daemon" requirement="300195">   
       <pre_steps>