diff --git a/tests/Harmattan/TestScripts/tc_splash.rb b/tests/Harmattan/TestScripts/tc_splash.rb index eb4772e..267c589 100755 --- a/tests/Harmattan/TestScripts/tc_splash.rb +++ b/tests/Harmattan/TestScripts/tc_splash.rb @@ -34,7 +34,7 @@ class TC_Splash < Test::Unit::TestCase apps = ['fala_wl', 'fala_ft_hello'] for app in apps if system("pgrep #{app}") == true - system("kill -9 `pgrep #{app}`") + system("kill -15 `pgrep #{app}`") end end end @@ -43,7 +43,7 @@ class TC_Splash < Test::Unit::TestCase apps = ['fala_wl', 'fala_ft_hello'] for app in apps if system("pgrep #{app}") == true - system("kill -9 `pgrep #{app}`") + system("kill -15 `pgrep #{app}`") end end print_debug("Exiting teardown") @@ -134,7 +134,7 @@ class TC_Splash < Test::Unit::TestCase system "invoker --splash #{PortraitImg} --splash-landscape #{LandscapeImg} --type=m #{TestApp} &" sleep(2) p = get_pid(TestApp) - system "kill -9 #{p}" + system "kill -15 #{p}" sleep(2) system "invoker --type=m #{No_Splash_App} &" sleep(2) @@ -157,7 +157,7 @@ class TC_Splash < Test::Unit::TestCase verify_equal("Fala_wl", 2, "Wrong Application Name"){prop2.split('"')[1]} verify_equal(PortraitImg, 2, "Wrong splash image"){prop3.split('"')[1]} verify_equal(LandscapeImg, 2, "Wrong splash image"){prop4.split('"')[1]} - system ("kill -9 #{pid}") + system ("kill -15 #{pid}") end diff --git a/tests/Harmattan/TestScripts/ts_prestartapp.rb b/tests/Harmattan/TestScripts/ts_prestartapp.rb index 378253b..7c9ed7e 100755 --- a/tests/Harmattan/TestScripts/ts_prestartapp.rb +++ b/tests/Harmattan/TestScripts/ts_prestartapp.rb @@ -57,7 +57,7 @@ class TC_PRESTARTLAUNCHTESTS < Test::Unit::TestCase #Test that a prestarted application can be launched @appname = 'fala_wl' if system("pgrep #{@appname}") == true - system("kill -9 `pgrep #{@appname}`") + system("kill -15 `pgrep #{@appname}`") end verify_equal(false,2,"Application is Prestarted"){ system "pgrep #{@appname}"} diff --git a/tests/Harmattan/TestScripts/utils.py b/tests/Harmattan/TestScripts/utils.py index 0db7074..1a982bc 100644 --- a/tests/Harmattan/TestScripts/utils.py +++ b/tests/Harmattan/TestScripts/utils.py @@ -144,7 +144,7 @@ def wait_for_app(app = None, timeout = 5, sleep = 0.5): return pid -def kill_process(appname=None, apppid=None, signum=9): +def kill_process(appname=None, apppid=None, signum=15): if apppid and appname: return None else: