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

Merge branch 'master' (early part) into PR13

Browse Source 
Conflicts:
	debian/changelog
pull/1/head
Marek Ruszczak 14 years ago
parent ba960bf578 4c254013f8
commit 05ba6b95ac
5 changed files with 139 additions and 67 deletions
Show Stats Download Patch File Download Diff File

10
debian/changelog vendored
Unescape Escape View File

@ -9,9 +9,17 @@ applauncherd (3.0.1) unstable; urgency=low
-- Alexey Shilov <alexey@trdhcp147241> Mon, 14 Nov 2011 13:39:38 +0200
applauncherd (2.0.12) unstable; urgency=low
applauncherd (2.0.13) stable; urgency=low
* Fixes: NB#291039 - Integrated version of applauncherd is missing some important test cases
* Changes: testcases added/fixed for code coverage
-- Thyagarajan Balakrishnan <ext-thyagarajan.1.balarishnan@nokia.com> Tue, 22 Nov 2011 11:27:40 +0200
applauncherd (2.0.12) stable; urgency=low
* Changes: new test case added for /usr/lib trigger
* fixes for nightly build test failures
-- Dmitry Rozenshtein <ext-dmitry.2.rozenshtein@nokia.com> Wed, 11 Nov 2011 14:30:21 +0200

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

@ -109,22 +109,19 @@ class BootModeTests(unittest.TestCase):
#self.start_applauncherd_in_boot_mode()
# get booster pids in boot mode
pids = self.get_booster_pids()
oldBoosterPids = get_booster_pid()
self.assert_(all(oldBoosterPids), "atleast one of the boosters is not running")
# send SIGUSR1
kill_process('applauncherd', signum=10)
wait_for_app('booster-q')
wait_for_app('booster-m')
# get booster pids in normal mode
pids2 = self.get_booster_pids()
newBoosterPids = get_booster_pid()
# terminate applauncherd
kill_process('applauncherd', signum=15)
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")
self.assert_(all(newBoosterPids), "atleast one of the boosters is not running")
self.assert_(len(set(oldBoosterPids) & set(newBoosterPids)) == 0,
"atleast one of the boosters was not killed/restarted")
def launch_apps(self, n = 6, btype = 'm'):
# check that launching works and the apps are there

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

@ -130,7 +130,7 @@ class launcher_tests (unittest.TestCase):
"""
stop_applauncherd()
st, op = commands.getstatusoutput("initctl start xsession/applauncherd")
time.sleep(2)
wait_for_app('applauncherd')
st_new, op = commands.getstatusoutput("initctl start xsession/applauncherd")
self.assert_(st == 0, "Applauncherd do not start")
@ -162,13 +162,13 @@ class launcher_tests (unittest.TestCase):
process_id = wait_for_app(prefered_app, 5)
debug("The pid of %s id %s" %(prefered_app, process_id))
kill_process(prefered_app)
time.sleep(4)
wait_for_process_end(prefered_app)
process_handle = run_app_as_user_with_invoker(prefered_app,booster = btype)
process_id1 = wait_for_app(prefered_app, 5)
debug("The pid of %s id %s" %(prefered_app, process_id1))
kill_process(prefered_app)
time.sleep(4)
wait_for_process_end(prefered_app)
process_id2 = get_pid(prefered_app)
debug("The pid of %s id %s" %(prefered_app, process_id1))
@ -233,14 +233,22 @@ class launcher_tests (unittest.TestCase):
debug("PID of first %s" % process_id)
process_handle1 = run_app_as_user_with_invoker(prefered_app, booster=btype)
time.sleep(3)
# second call of invoker should return immediately
for i in range(10) :
process_handle1.poll()
if process_handle1.returncode!=None :
debug("Second call of invoker has returned code: %s (loop run: %s)" %(process_handle1.returncode, i))
break
time.sleep(1)
process_id1 = wait_for_app(prefered_app)
debug("PID of 2nd %s" % process_id1)
st, pids = commands.getstatusoutput("pgrep %s" % prefered_app) #get all pids of the app
st, pids = commands.getstatusoutput("pgrep -l %s" % prefered_app) #get all pids of the app
kill_process(prefered_app)
self.assert_( len(pids.split()) == 1, "Only one instance of app not running")
self.assert_( len(pids.split('\n')) == 1, "More then one instance of app is running: %s" %pids)
if(sighup):
self.sighup_applauncherd()
self._test_one_instance(prefered_app, btype, False)
@ -265,14 +273,23 @@ class launcher_tests (unittest.TestCase):
#in a global dictionary, append the pid
process_handle = run_app_as_user_with_invoker(app, booster = btype)
time.sleep(15)
startTime = time.time() + 30
debug("Waiting for %s apps with prefix '%s' to start up in 30s..." %(len(launchable_apps), app_common_prefix))
pid_list = None
while time.time() < startTime+30 :
process_id = get_pid(app_common_prefix)
if process_id :
pid_list = process_id.split('\n')
if len(pid_list) == len(launchable_apps) :
break
time.sleep(2)
debug("Waiting process took %.1fs." %(time.time()-startTime))
process_id = get_pid(app_common_prefix)
pid_list = process_id.split()
for pid in pid_list:
kill_process(apppid=pid)
self.assert_(len(pid_list) == len(launchable_apps), "All Applications were not launched using launcher")
self.assert_(len(pid_list) == len(launchable_apps), "Not All Applications were launched using launcher")
if(sighup):
self.sighup_applauncherd()
self._test_launch_multiple_apps_cont(launchable_apps, app_common_prefix, btype, False)
@ -306,28 +323,30 @@ class launcher_tests (unittest.TestCase):
"""
To test that file descriptors are closed before calling application main
"""
debug("kill %s if it already exists" % app_name)
kill_process(app_name)
wait_for_process_end(app_name)
#get fd of booster before launching application
debug("get fd of booster before launching application")
pid = get_pid('booster-%s'%btype)
pid = wait_for_app('booster-%s'%btype)
init = get_fd_dict(pid)
debug("\nThe initial file descriptors are : %s\n" %init)
#launch application using booster
debug("kill %s if it already exists" % app_name)
kill_process(app_name)
time.sleep(1) # give sometime for app to get killed
debug("launch %s using booster" % app_name)
st = os.system('invoker --type=%s --no-wait %s' % (btype, app_name))
self.assert_(st == 0, "failed to start %s,%s" % (app_name,st))
# wait for new booster and app to start
wait_for_app(app_name)
pid1 = wait_for_app(app_name)
#get fd of booster after launching the application
debug("get fd of booster after launching the application")
final = get_fd_dict(pid)
debug("\nThe final file descriptors are : %s\n" %final)
pid = get_pid(app_name)
kill_process(app_name)
self.assert_(pid == pid1, "application did not start with same booster")
mykeys = init.keys()
count = 0
@ -340,7 +359,6 @@ class launcher_tests (unittest.TestCase):
print "some key in init is not in final"
debug("The number of changed file descriptors %d" %count)
kill_process(apppid=pid)
self.assert_(count != 0, "None of the file descriptors were changed")
if(sighup):
@ -405,10 +423,7 @@ class launcher_tests (unittest.TestCase):
stop_applauncherd()
#wait for the applauncherd to be closed
for i in range(5) :
if (get_pid('applauncherd')==None) :
break
time.sleep(1)
wait_for_process_end('applauncherd')
#check that the none of the booster is running
debug("check that the none of the booster is running")
@ -478,7 +493,8 @@ class launcher_tests (unittest.TestCase):
"""
if get_pid(app_name) != None:
kill_process(app_name)
time.sleep(2)
wait_for_process_end(app_name)
count = 0
p = run_cmd_as_user('invoker --type=%s --no-wait %s %s' % (booster_type, invoker_extra_flags, app_name))
pid = get_pid(app_name)
@ -570,25 +586,33 @@ class launcher_tests (unittest.TestCase):
for i in range(2):
debug("Running cycle %s" %i)
p = run_app_as_user_with_invoker("%s -testability" %testapp, booster = btype)
time.sleep(2)
pid = get_pid(testapp)
pid = wait_for_app(testapp)
self.assert_(pid != None, "Can't start application %s" %testapp)
st_tas, op_tas = commands.getstatusoutput("grep -c libtestability.so /proc/%s/maps" %pid)
for j in range(3) :
st_tas, op_tas = commands.getstatusoutput("grep -c libtestability.so /proc/%s/maps" %pid)
if st_tas == 0 :
break
time.sleep(1)
debug("The value of status is %d" %st_tas)
debug("The value of output is %s" %op_tas)
st_tas_plug, op_tas_plug = commands.getstatusoutput("grep -c libqttestability.so /proc/%s/maps" %pid)
for j in range(3) :
st_tas_plug, op_tas_plug = commands.getstatusoutput("grep -c libqttestability.so /proc/%s/maps" %pid)
if st_tas_plug == 0 :
break
time.sleep(1)
debug("The value of status is %d" %st_tas_plug)
debug("The value of output is %s" %op_tas_plug)
kill_process(apppid=pid)
kill_process(testapp)
# wait_for_process_end(testapp)
time.sleep(2)
self.assert_(st_tas == 0,"libtestability.so not loaded")
self.assert_(st_tas_plug == 0,"libqttestability.so not loaded")
time.sleep(2)
if(sighup):
self.sighup_applauncherd()
@ -612,9 +636,7 @@ class launcher_tests (unittest.TestCase):
p = subprocess.Popen(cmd, shell = False, stdout = DEV_NULL, stderr = DEV_NULL)
time.sleep(2)
pid = get_pid(testapp)
pid = wait_for_app(testapp)
self.assert_(pid != None, "Can't start application %s" %testapp)
st_tas, op_tas = commands.getstatusoutput("grep -c libtestability.so /proc/%s/maps" %pid)
@ -625,13 +647,12 @@ class launcher_tests (unittest.TestCase):
debug("The value of status is %d" %st_tas_plug)
debug("The value of output is %s" %op_tas_plug)
kill_process(apppid=pid)
kill_process(testapp)
wait_for_process_end(testapp)
self.assert_(st_tas == 0,"libtestability.so not loaded")
self.assert_(st_tas_plug == 0,"libqttestability.so not loaded")
time.sleep(2)
if(sighup):
self.sighup_applauncherd()
self._test_qttas_load_env_booster(testapp, btype, False)
@ -658,11 +679,15 @@ class launcher_tests (unittest.TestCase):
if get_pid(testapp)!= None:
kill_process(testapp)
p = run_cmd_as_user('invoker --type=%s %s/%s' % (btype, path, testapp))
time.sleep(4)
pid = get_pid(testapp)
pid = wait_for_app(testapp)
self.assert_(pid != None, "The application was not launched")
debug("get filePath and dirPath from log file")
st, op = commands.getstatusoutput("grep Path /tmp/%s.log | tail -2" % testapp)
st, op = None, None
for i in range(5) :
st, op = commands.getstatusoutput("grep Path /tmp/%s.log | tail -2" % testapp)
if op and '\n' in op :
break
time.sleep(1)
debug("get filePath and dirPath from log file: >>>%s<<<" %(op))
dirpath = op.split("\n")[0].split(" ")[2]
self.assert_(dirpath == path, "Wrong dirPath: %s" % dirpath)
filepath = op.split("\n")[1].split(" ")[2]
@ -672,7 +697,7 @@ class launcher_tests (unittest.TestCase):
if(sighup):
self.sighup_applauncherd()
self._test_dirPath_filePath(btype, path, testapp, False)
def test_argv_mbooster_limit(self):
self._test_argv_booster_limit("m", "fala_wl")
@ -688,13 +713,19 @@ class launcher_tests (unittest.TestCase):
if get_pid(testapp)!= None:
kill_process(testapp)
p = run_cmd_as_user('invoker --type=%s /usr/bin/%s --log-args 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t' % (btype, testapp))
time.sleep(4)
pid = get_pid(testapp)
pid = wait_for_app(testapp)
self.assert_(pid != None, "The application was not launched")
debug("get arguments from log file")
st, op = commands.getstatusoutput("grep argv: /tmp/%s.log | tail -2" % testapp)
original_argv = op.split("\n")[0]
cache_argv = op.split("\n")[1]
st, op = None, None
for i in range(5) :
st, op = commands.getstatusoutput("grep argv: /tmp/%s.log | tail -2" % testapp)
if op and '\n' in op :
break
time.sleep(1)
debug("get arguments from log file: >>>%s<<<" %(op))
original_argv, cache_argv = op.split("\n")
kill_process(apppid=pid)
self.assert_(original_argv == cache_argv, "Wrong arguments passed.\nOriginal: %s\nCached: %s" % (original_argv, cache_argv))
@ -719,12 +750,17 @@ class launcher_tests (unittest.TestCase):
if get_pid(testapp)!= None:
kill_process(testapp)
p = run_cmd_as_user('invoker --type=%s /usr/bin/%s --log-args 0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v w x y z' % (btype, testapp))
time.sleep(4)
pid = get_pid(testapp)
pid = wait_for_app(testapp)
kill_process(apppid=pid)
self.assert_(pid != None, "The application was not launched")
debug("get arguments from log file")
st, op = commands.getstatusoutput("grep argv: /tmp/%s.log | tail -2" % testapp)
st, op = None, None
for i in range(10) :
st, op = commands.getstatusoutput("grep argv: /tmp/%s.log | tail -2" % testapp)
if op and '\n' in op :
break
time.sleep(1)
debug("get arguments from log file: >>>%s<<<" %(op))
original_argv = op.split("\n")[0].split(" ")[1:]
cache_argv = op.split("\n")[1].split(" ")[1:]
self.assert_(len(cache_argv) == ARGV_LIMIT, "Wrong number of arguments passed.\nOriginal: %s\nCached: %s" % (original_argv, cache_argv))
@ -770,7 +806,7 @@ class launcher_tests (unittest.TestCase):
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)
wait_for_process_end(app_wol)
#Get status for booster application
debug("Restart home ")
@ -795,7 +831,7 @@ class launcher_tests (unittest.TestCase):
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)
wait_for_process_end(app_wl)
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")
@ -926,8 +962,7 @@ class launcher_tests (unittest.TestCase):
# run app which has GL context
p = run_app_as_user_with_invoker(testapp, booster = btype, arg = '--no-wait')
time.sleep(4)
app_pid = get_pid(testapp)
app_pid = wait_for_app(testapp)
self.assert_(app_pid != None, "Process '%s' is not running"%testapp)
self.assert_(app_pid == booster_pid, "Process '%s' is not a boosted app"%testapp)
@ -960,10 +995,13 @@ class launcher_tests (unittest.TestCase):
# note that application is run by direct invacation not by calling the service
run_command = 'invoker --single-instance --type=%s /usr/bin/%s' %(boosterType, testAppName)
p = run_cmd_as_user(run_command)
time.sleep(1)
# wait for first use of booster
wait_for_app(testAppName)
debug("First run command result is: %s" %(p))
# wait for NEW booster
boosterPid = wait_for_app(boosterName, 10)
self.assertNotEqual(boosterPid, None, "Test incoclusive, the booster is not ready - timeout.")

6
tests/harmattan/testscripts/test-security.py
Unescape Escape View File

@ -220,7 +220,7 @@ class SecurityTests(unittest.TestCase):
print "launching application"
invoker = run_app_as_user_with_invoker('/usr/bin/fala_ft_hello', booster = 'm', arg = '--wait-term')
time.sleep(2)
wait_for_app('fala_ft_hello')
# get credentials
invoker_creds = get_creds(path = 'invoker')
@ -294,7 +294,7 @@ class SecurityTests(unittest.TestCase):
stdout = DEV_NULL, stderr = DEV_NULL)
# give the application some time to launch up
time.sleep(2)
wait_for_app('fala_ft_hello')
root = get_creds('fala_ft_hello')
kill_process('fala_ft_hello')
@ -361,7 +361,7 @@ class SecurityTests(unittest.TestCase):
invoker_specific_creds = ['applauncherd-invoker::applauncherd-invoker',\
'applauncherd-launcher::access']
p = run_app_as_user_with_invoker("/usr/bin/fala_wl")
time.sleep(3)
wait_for_app('fala_wl')
st, op = commands.getstatusoutput("pgrep -lf '/usr/bin/invoker --type=m /usr/bin/fala_wl'")
pid = op.split("\n")[0].split(" ")[0]
debug("The pid of Invoker is %s" % pid)

29
tests/harmattan/testscripts/utils.py
Unescape Escape View File

@ -231,6 +231,35 @@ def kill_process(appname=None, apppid=None, signum=15):
temp = basename(appname)[:14]
st, op = commands.getstatusoutput("pkill -%s %s" % (str(signum), temp))
def wait_for_process_end(appName = None, appPid = None, timeout = 10, sleep=1) :
if appName :
debug("Waiting for termination of '%s' application (time out %.1f)" %(appName, timeout))
startTime = time.time()
endTime = startTime + timeout
op = ""
while time.time()<endTime :
st, op = commands.getstatusoutput("pgrep -l %s" %appName)
if st!=0 :
debug("Application '%s' has been terminated after %.1fs" %(appName, time.time() - startTime))
return True
time.sleep(sleep)
debug("Application '%s' was not finished/terminated after %.1fs.\npgrep outcome:\n%s" %(appName, timeout, op))
return False
if appPid:
debug("Waiting for termination of process PID=%s (time out %.1f)" %(appPid, timeout))
startTime = time.time()
endTime = startTime + timeout
while time.time()<endTime :
if not os.path.exists("/proc/%s/cmdline" %appPid) :
debug("Process with PID=%s has been terminated after %.1fs" %(appPid, time.time() - startTime))
return True
time.sleep(sleep)
debug("Process with PID=%s was not finished/terminated after %.1fs" %(appPid, timeout))
return False
raise TypeError("Application name or process PID is expected.")
def process_state(processid):
st, op = commands.getstatusoutput('cat /proc/%s/stat' %processid)
debug("The Process State of %s is %s" %(processid, op))

Write Preview
Loading…
Cancel
Save