Changes: Modified performance scripts to not die when duihome is renamed to meegotouchhome

tests/TestScripts/fala_xres_wl

@@ -1,5 +1,5 @@
 #!/bin/sh
-x=`sh /usr/bin/fala_wid`
+x=`sh /usr/share/applauncherd-testscripts/fala_wid`
 xresponse -a 'duihome' -w 0 -id $x -c $1 -u > /tmp/app_xresponse.log&
 echo $x
                                       

tests/TestScripts/test-perf-mbooster.py

@@ -117,6 +117,7 @@ class launcher_perf_tests (unittest.TestCase):
         if os.path.exists(LOG_FILE) and os.path.isfile(LOG_FILE):               
             os.system('rm %s' %LOG_FILE)                                                        
         os.system('pkill -STOP duihome')
+        os.system('pkill -STOP meegotouchhome')
         self.start_timer()
         p = subprocess.Popen(TESTAPP,
                              shell=False,
@@ -124,6 +125,7 @@ class launcher_perf_tests (unittest.TestCase):
         debug("app", TESTAPP, "started without launcher")                                   
         time.sleep(5)
         os.system('pkill -CONT duihome')
+        os.system('pkill -CONT meegotouchhome')
         self.read_log()
         app_time = self.app_start_time()
         self.kill_process(appname)
@@ -177,11 +179,13 @@ class launcher_perf_tests (unittest.TestCase):
         if os.path.exists(LOG_FILE) and os.path.isfile(LOG_FILE):               
             os.system('rm %s' %LOG_FILE)                                                        
         os.system('pkill -STOP duihome')
+        os.system('pkill -STOP meegotouchhome')
         self.start_timer()
         os.system('invoker --type=m %s' %TESTAPP)
         debug("app", TESTAPP, "started with launcher")                                   
         time.sleep(5)
         os.system('pkill -CONT duihome')
+        os.system('pkill -CONT meegotouchhome')
         self.read_log()
         app_time = self.app_start_time()
         self.kill_process(appname)

tests/TestScripts/test-perf.rb

@@ -41,10 +41,13 @@ class TC_PerformanceTests < Test::Unit::TestCase
             puts "Inside SB, Do Nothing to unlock"
         else
 	    system "mcetool --set-tklock-mode=unlocked"
+
             # restart duihome so that qttasserver notices it
-            verify { 
+            # NOTE: Remove the cludge after duihome -> meegotouchhome renaming is complete
-                system("/sbin/initctl restart xsession/duihome")
+            if not system("/sbin/initctl restart xsession/duihome")
-            }
+                system("/sbin/initctl restart xsession/meegotouchhome")
+            end
+
             system("initctl stop xsession/sysuid")
             sleep (5)
         end
@@ -64,7 +67,12 @@ class TC_PerformanceTests < Test::Unit::TestCase
         end
         
         #Open the Application from the application grid
-        @meegoHome = @sut.application(:name => 'duihome')
+        begin
+            @meegoHome = @sut.application(:name => 'duihome')
+        rescue MobyBase::TestObjectNotFoundError
+            @meegoHome = @sut.application(:name => 'meegotouchhome')
+        end
+
         sleep(2)
         if @meegoHome.test_object_exists?("LauncherButton", :text => appName)
             icon = @meegoHome.LauncherButton(:name => "LauncherButton", :text => appName)
@@ -78,10 +86,10 @@ class TC_PerformanceTests < Test::Unit::TestCase
 	    @pos = "#{xpos}x#{ypos}"
 
             if appName == APP_WITH_LAUNCHER 
-                @winId = `sh /usr/bin/fala_xres_wl #{@pos}`
+                @winId = `sh /usr/share/applauncherd-testscripts/fala_xres_wl #{@pos}`
                 @winId = @winId.split("\n")[0]
             else
-                system "sh /usr/bin/fala_xres_wol #{@pos}"
+                system "sh /usr/share/applauncherd-testscripts/fala_xres_wol #{@pos}"
             end 
  
             @meegoHome.LauncherButton(:name => "LauncherButton", :text => appName).tap