Changes: Tests fixed as the default --wait-term made them fail.

RevBy: Antti Kervinen

tests/TestApps/creds/fala_ft_creds

@@ -1,3 +1,3 @@
 #!/bin/sh
-echo "/usr/bin/invoker --type=m" $0.launch $@
-exec /usr/bin/invoker --type=m $0.launch $@
+echo "/usr/bin/invoker --type=m --no-wait" $0.launch $@
+exec /usr/bin/invoker --type=m --no-wait $0.launch $@

tests/TestApps/helloworld/scripts/fala_ft_hello

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-echo "/usr/bin/invoker --type=m" $0.launch $@
-exec /usr/bin/invoker --type=m $0.launch $@
+echo "/usr/bin/invoker --type=m --no-wait" $0.launch $@
+exec /usr/bin/invoker --type=m --no-wait $0.launch $@

tests/TestScripts/tc_theming.rb

@@ -86,7 +86,7 @@ class TC_Theming < Test::Unit::TestCase
 
         system("pkill #{app_name}")
 
-        system("su - user -c #{app_name}")
+        system("su - user -c #{app_name}&")
         sleep(5)
 
         #pid = `pgrep -n #{app_name}`
@@ -184,7 +184,7 @@ class TC_Theming < Test::Unit::TestCase
 
         app_name = 'fala_ft_hello'
         system("pkill #{app_name}")
-        system("su - user -c #{app_name}")
+        system("su - user -c #{app_name}&")
         sleep(2)
 
         original_theme = get_theme()

tests/TestScripts/test-func-launcher.py

@@ -286,7 +286,7 @@ class launcher_tests (unittest.TestCase):
 
         # launch an app with invoker --delay n
         print "launching fala_ft_hello ..."
-        p = Popen(['/usr/bin/invoker', '--delay', '10', '--type=m',
+        p = Popen(['/usr/bin/invoker', '--delay', '10', '--type=m', '--no-wait',
                    '/usr/bin/fala_ft_hello.launch'],
                   shell=False, 
                   stdout=DEV_NULL, stderr=DEV_NULL)
@@ -391,7 +391,7 @@ class launcher_tests (unittest.TestCase):
         print("System %s \nSyetem %s" %(usr_id1, grp_id1))
 
         #get id by running the application using invoker in user mode
-        app = "invoker --type=m /usr/bin/fala_status.launch" 
+        app = "invoker --type=m --no-wait /usr/bin/fala_status.launch" 
         st, op = commands.getstatusoutput('su user -c "%s"' %app );
         usr_id = op.split('\n')[1]
         grp_id = op.split('\n')[2]
@@ -418,7 +418,7 @@ class launcher_tests (unittest.TestCase):
         print("System %s \nSyetem %s" %(usr_id1, grp_id1))
 
         #get id by running the application using invoker in root mode
-        app = "invoker --type=m /usr/bin/fala_status.launch" 
+        app = "invoker --type=m --no-wait /usr/bin/fala_status.launch" 
         st, op = commands.getstatusoutput("%s" %app );
         usr_id = op.split('\n')[1]
         grp_id = op.split('\n')[2]

tests/TestScripts/test-perf-mbooster.py

@@ -130,7 +130,7 @@ class launcher_perf_tests (unittest.TestCase):
             os.system('rm %s' %LOG_FILE)                                                        
 
         self.start_timer()
-        os.system('invoker --type=m %s' %TESTAPP)
+        os.system('invoker --type=m --no-wait %s' %TESTAPP)
         debug("app", TESTAPP, "started with launcher")                                   
         time.sleep(5)
         self.read_log()
@@ -145,7 +145,7 @@ class launcher_perf_tests (unittest.TestCase):
             os.system('rm %s' %LOG_FILE)                                                        
 
         self.start_timer()
-        os.system('invoker --type=wrt %s' %TESTAPP)
+        os.system('invoker --type=wrt --no-wait %s' %TESTAPP)
         debug("app", TESTAPP, "started with wrt-launcher")                                   
         time.sleep(5)
         self.read_log()
@@ -161,7 +161,7 @@ class launcher_perf_tests (unittest.TestCase):
         os.system('pkill -STOP duihome')
         os.system('pkill -STOP meegotouchhome')
         self.start_timer()
-        os.system('invoker --type=m %s' %TESTAPP)
+        os.system('invoker --type=m --no-wait %s' %TESTAPP)
         debug("app", TESTAPP, "started with launcher")                                   
         time.sleep(5)
         os.system('pkill -CONT duihome')

tests/TestScripts/test-security.py

@@ -122,7 +122,7 @@ class SecurityTests(unittest.TestCase):
         Testapp = '/usr/bin/fala_ft_hello.launch'
 
         #launching the testapp with actual invoker
-        st = os.system('%s --type=m %s'%(INVOKER_BINARY, Testapp))
+        st = os.system('%s --type=m --no-wait %s'%(INVOKER_BINARY, Testapp))
         pid = get_pid(Testapp.replace('.launch', ''))
         self.assert_((st == 0), "Application was not launched using launcher")
         self.assert_(not (pid == None), "Application was not launched using launcher: actual pid%s" %pid)
@@ -133,7 +133,7 @@ class SecurityTests(unittest.TestCase):
         self.assert_((pid == None), "Application still running")        
         
         #launching the testapp with fake invoker
-        st = os.system('%s --type=m %s'%(FAKE_INVOKER_BINARY, Testapp)) 
+        st = os.system('%s --type=m --no-wait %s'%(FAKE_INVOKER_BINARY, Testapp)) 
         pid = get_pid(Testapp.replace('.launch', ''))
         self.assert_(not (st == 0), "Application was launched using fake launcher")
         self.assert_((pid == None), "Application was launched using fake launcher")

tests/TestScripts/utils.py

@@ -221,7 +221,7 @@ def get_file_descriptor(booster, type):
     print init
 
     #launch application using booster
-    st = os.system('invoker --type=%s /usr/bin/fala_ft_hello.launch' %type)
+    st = os.system('invoker --type=%s --no-wait /usr/bin/fala_ft_hello.launch' %type)
     time.sleep(2)
 
     #get fd of booster after launching the application