aiden
/
appmotor
mirror of https://github.com/cutefishos/appmotor
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Changes: Added boot-mode test for booster-d. Removed duplicated test code.

Browse Source 
RevBy: Olli Leppanen
pull/1/head
Nimika Keshri 14 years ago
parent 8f7191c076
commit eed0c2e15a
2 changed files with 39 additions and 62 deletions
Show Stats Download Patch File Download Diff File

32
tests/harmattan/testscripts/test-boot-mode.py
Unescape Escape View File

@ -75,10 +75,10 @@ class BootModeTests(unittest.TestCase):
if get_pid('applauncherd') != None:
kill_process('applauncherd')
start_applauncherd()
if get_pid('applifed') == None:
os.system("initctl start xsession/applifed")
wait_for_app('camera-ui')
start_applauncherd()
def start_applauncherd_in_boot_mode(self):
remove_applauncherd_runtime_files()
@ -126,10 +126,10 @@ class BootModeTests(unittest.TestCase):
self.assert_(pids[0] != pids2[0], "pid of booster-m didn't change")
self.assert_(pids[1] != pids2[1], "pid of booster-m didn't change")
def launch_apps(self, n = 6):
def launch_apps(self, n = 6, btype = 'm'):
# check that launching works and the apps are there
for i in range(n):
run_cmd_as_user('/usr/bin/invoker -n -r 2 --type=m fala_multi-instance %d' % i)
run_cmd_as_user('/usr/bin/invoker -n -r 2 --type=%s fala_multi-instance %d' % (btype, i))
time.sleep(4)
# give the applications time to really start
@ -156,16 +156,20 @@ class BootModeTests(unittest.TestCase):
# launch apps in boot mode
res_boot = self.launch_apps(6)
debug("Res at boot : %s" %res_boot)
res_boot_d = self.launch_apps(6, 'd')
debug("Res at boot for booster-m: %s" %res_boot)
debug("Res at boot for booster-d : %s" %res_boot_d)
# switch to normal mode and give boosters some time to start
kill_process('applauncherd', signum=10)
wait_for_app('booster-m')
wait_for_app('booster-q')
wait_for_app('booster-d')
# launch apps in normal mode
res_norm = self.launch_apps(6)
debug("Res at normal : %s" %res_norm)
res_norm_d = self.launch_apps(6, 'd')
debug("Res at normal for booster-m: %s" %res_norm)
debug("Res at normal for booster-d : %s" %res_norm_d)
# and finally, terminate applauncherd
kill_process('applauncherd', signum=15)
@ -174,15 +178,23 @@ class BootModeTests(unittest.TestCase):
# assert that the boot mode results are correct
self.assert_(res_boot[0] == 6 and res_boot[1] == 6,
"%d apps, %d windows. Expected %d apps, %d windows (boot mode)" % (res_boot[0],
"With booster-m %d apps, %d windows. Expected %d apps, %d windows (boot mode)" % (res_boot[0],
res_boot[1],
6, 6))
self.assert_(res_boot_d[0] == 6 and res_boot_d[1] == 6,
"With booster-d %d apps, %d windows. Expected %d apps, %d windows (boot mode)" % (res_boot_d[0],
res_boot_d[1],
6, 6))
# assert that the normal mode results are correct
self.assert_(res_norm[0] == 6 and res_norm[1] == 12,
"%d apps, %d windows. Expected %d apps, %d windows (normal mode)" % (res_norm[0],
"With booster-m %d apps, %d windows. Expected %d apps, %d windows (normal mode)" % (res_norm[0],
res_norm[1],
6, 12))
self.assert_(res_norm_d[0] == 6 and res_norm_d[1] == 6,
"With booster-d %d apps, %d windows. Expected %d apps, %d windows (normal mode)" % (res_norm_d[0],
res_norm_d[1],
6, 6))
def test_SIGUSR2(self):
"""
@ -250,8 +262,8 @@ if __name__ == '__main__':
result = unittest.TextTestRunner(verbosity=2).run(mysuite)
# kill applauncherd if it's left running and restart it
kill_process('applauncherd')
restart_applauncherd()
if get_pid('applauncherd') == None:
start_applauncherd()
if not result.wasSuccessful():
sys.exit(1)

69
tests/harmattan/testscripts/test-func-launcher.py
Unescape Escape View File

@ -759,89 +759,53 @@ class launcher_tests (unittest.TestCase):
is same for both boosted and non boosted applications
"""
#Get status for non boosted apps
debug("Restart home ")
os.system("initctl restart xsession/mthome")
time.sleep(5)
debug("Get the co-ordinates of the application from the grid")
st, op = commands.getstatusoutput("%s -a %s" %(GET_COORDINATE_SCRIPT, app_wol))
time.sleep(2)
pos = op.split("\n")[-1]
debug("The co-ordinates of %s is %s" %(app_wol, pos))
debug("Now tap to launch the application")
os.system("%s -c %s -q" %(PIXELCHANHED_BINARY, pos))
time.sleep(2)
pid = get_pid(app_wol)
st, SigBlk_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigBlk" %pid)
st, SigIgn_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigIgn" %pid)
st, SigCgt_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigCgt" %pid)
kill_process(app_wol)
time.sleep(2)
#Get status for booster application
os.system("initctl restart xsession/mthome")
time.sleep(5)
st, op = commands.getstatusoutput("%s -a %s" %(GET_COORDINATE_SCRIPT, app_wl))
time.sleep(2)
pos = op.split("\n")[-1]
os.system("%s -c %s -q" %(PIXELCHANHED_BINARY, pos))
time.sleep(2)
pid = get_pid(app_wl)
st, SigBlk_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigBlk" %pid)
st, SigIgn_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigIgn" %pid)
st, SigCgt_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigCgt" %pid)
kill_process(app_wl)
time.sleep(2)
self.assert_(SigBlk_wol == SigBlk_wl, "The SigBlk is not same for both apps")
self.assert_(SigIgn_wol == SigIgn_wl, "The SigIgn is not same for both apps")
self.assert_(SigCgt_wol == SigCgt_wl, "The SigCgt is not same for both apps")
def test_signal_status_m(self):
self._test_signal_status("fala_wl", "fala_wol")
def test_signal_status_qml(self):
self._test_signal_status("fala_qml_wl", "fala_qml_wol")
def _test_signal_status(self, app_wl, app_wol):
"""
Test that values of SigBlk, SigIgn and SigCgt in /proc/pid/status
is same for both boosted and non boosted applications
"""
#Get status for non boosted apps
os.system("initctl restart xsession/mthome")
time.sleep(5)
st, op = commands.getstatusoutput("%s -a %s" %(GET_COORDINATE_SCRIPT, app_wol))
time.sleep(2)
pos = op.split("\n")[-1]
os.system("%s -c %s -q" %(PIXELCHANHED_BINARY, pos))
time.sleep(2)
pid = wait_for_app(app_wol)
self.assert_(pid != None, "The application was not launched")
pid = get_pid(app_wol)
st, SigBlk_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigBlk" %pid)
st, SigIgn_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigIgn" %pid)
st, SigCgt_wol = commands.getstatusoutput("cat /proc/%s/status | grep SigCgt" %pid)
debug("The SigBlk is %s, SigIgn is %s and SigCgt is %s for %s" %(SigBlk_wol, SigIgn_wol, SigCgt_wol, app_wol))
kill_process(app_wol)
time.sleep(2)
#Get status for booster application
debug("Restart home ")
os.system("initctl restart xsession/mthome")
time.sleep(5)
debug("Get the co-ordinates of the application from the grid")
st, op = commands.getstatusoutput("%s -a %s" %(GET_COORDINATE_SCRIPT, app_wl))
time.sleep(2)
pos = op.split("\n")[-1]
debug("The co-ordinates of %s is %s" %(app_wl, pos))
debug("Now tap to launch the application")
os.system("%s -c %s -q" %(PIXELCHANHED_BINARY, pos))
time.sleep(2)
pid = get_pid(app_wl)
pid = wait_for_app(app_wl)
self.assert_(pid != None, "The application was not launched")
st, SigBlk_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigBlk" %pid)
st, SigIgn_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigIgn" %pid)
st, SigCgt_wl = commands.getstatusoutput("cat /proc/%s/status | grep SigCgt" %pid)
debug("The SigBlk is %s, SigIgn is %s and SigCgt is %s for %s" %(SigBlk_wl, SigIgn_wl, SigCgt_wl, app_wl))
kill_process(app_wl)
time.sleep(2)
@ -849,6 +813,7 @@ class launcher_tests (unittest.TestCase):
self.assert_(SigIgn_wol == SigIgn_wl, "The SigIgn is not same for both apps")
self.assert_(SigCgt_wol == SigCgt_wl, "The SigCgt is not same for both apps")
def test_launched_app_wm_class_m(self):
"""
Test that launched application have correct WM_CLASS Xproperty booster m

Write Preview
Loading…
Cancel
Save