From 9116576aa4aa1235c64cf383f0784a8406abdcad Mon Sep 17 00:00:00 2001 From: Nimika Keshri Date: Fri, 20 May 2011 16:09:58 +0300 Subject: [PATCH] Revert "Changes: Add TemporaryProcessName() Test" This reverts commit b44e3b01fbc7e713554cb845e006c41258bd62f3. --- tests/harmattan/functests/tests.xml | 5 -- .../testscripts/test-func-launcher.py | 49 ++++++++++--------- 2 files changed, 25 insertions(+), 29 deletions(-) diff --git a/tests/harmattan/functests/tests.xml b/tests/harmattan/functests/tests.xml index f22f283..6a92441 100644 --- a/tests/harmattan/functests/tests.xml +++ b/tests/harmattan/functests/tests.xml @@ -327,11 +327,6 @@ source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_wait_term_e - - source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_temporary_process_name - - - source /tmp/session_bus_address.user; DISPLAY=:0 `pyversions -d` /usr/share/applauncherd-testscripts/test-func-launcher.py test_fd_booster_e diff --git a/tests/harmattan/testscripts/test-func-launcher.py b/tests/harmattan/testscripts/test-func-launcher.py index d5665ef..68a13e0 100644 --- a/tests/harmattan/testscripts/test-func-launcher.py +++ b/tests/harmattan/testscripts/test-func-launcher.py @@ -91,11 +91,8 @@ class launcher_tests (unittest.TestCase): self.START_DAEMONS_AT_TEARDOWN = False if get_pid('applauncherd') == None: - os.system('initctl start xsession/applauncherd') - time.sleep(5) - get_pid('booster-m') - get_pid('booster-q') - get_pid('booster-d') + start_applauncherd() + #setup here debug("Executing SetUp") @@ -103,9 +100,9 @@ class launcher_tests (unittest.TestCase): #teardown here debug("Executing TearDown") if get_pid('applauncherd') == None: - os.system('initctl start xsession/applauncherd') - time.sleep(5) + start_applauncherd() + wait_for_single_applauncherd() if self.START_DAEMONS_AT_TEARDOWN: start_daemons() @@ -298,7 +295,7 @@ class launcher_tests (unittest.TestCase): app_pid2 = get_pid(app_name) self.assert_(app_pid2 == None, "%s was not killed" % app_path) - + def test_daemon(self): """ @@ -307,14 +304,12 @@ class launcher_tests (unittest.TestCase): stop_applauncherd() - #remove_applauncherd_runtime_files() + remove_applauncherd_runtime_files() p = run_cmd_as_user('/usr/bin/applauncherd.bin --daemon') time.sleep(5) - #check_boosters_exists() - st, op = commands.getstatusoutput('pgrep -lf "applauncherd.bin --daemon"') p_id = op.split(" ")[0] debug("The pid of applauncherd --daemon is %s" %op) @@ -341,9 +336,9 @@ class launcher_tests (unittest.TestCase): # only the daemonized applauncherd should be running now kill_process(apppid = p_id) - commands.getstatusoutput('pkill applauncherd') + #commands.getstatusoutput('pkill applauncherd') - #remove_applauncherd_runtime_files() + remove_applauncherd_runtime_files() start_applauncherd() @@ -551,6 +546,7 @@ class launcher_tests (unittest.TestCase): #Test for m-booster debug("Test for m-booster") st, op = commands.getstatusoutput("/usr/share/applauncherd-testscripts/signal-forward/fala_sf_m.py") + time.sleep(3) debug("The Invoker killed by : <%s>" %op.split ('\n')[-1]) self.assert_(op.split('\n')[-1] == 'Segmentation fault (core dumped)', "The invoker(m-booster) was not killed by the same signal") @@ -559,6 +555,7 @@ class launcher_tests (unittest.TestCase): #Test for d-booster debug("Test for d-booster") st, op = commands.getstatusoutput("/usr/share/applauncherd-testscripts/signal-forward/fala_sf_d.py") + time.sleep(3) debug("The Invoker killed by : %s" % op.split('\n')[-1]) self.assert_(op.split('\n')[-1] == 'Terminated', "The invoker(d-booster) was not killed by the same signal") @@ -567,6 +564,7 @@ class launcher_tests (unittest.TestCase): #Test for e-booster debug("Test for e-booster") st, op = commands.getstatusoutput("/usr/share/applauncherd-testscripts/signal-forward/fala_sf_e.py") + time.sleep(3) debug("The Invoker killed by : %s" % op.split('\n')[-1]) self.assert_(op.split('\n')[-1] == 'Terminated', "The invoker(e-booster) was not killed by the same signal") @@ -576,6 +574,7 @@ class launcher_tests (unittest.TestCase): #Test for q-booster debug("Test for q-booster") st, op = commands.getstatusoutput("/usr/share/applauncherd-testscripts/signal-forward/fala_sf_qt.py") + time.sleep(3) debug("The Invoker killed by : %s" %op.split('\n')[-1]) self.assert_(op.split('\n')[-1] == 'Aborted (core dumped)', "The invoker(q-booster) was not killed by the same signal") @@ -849,7 +848,7 @@ class launcher_tests (unittest.TestCase): #For booster-m #Check though the process list p = run_cmd_as_user('invoker --type=m --no-wait fala_wl -faulty') - time.sleep(2) + time.sleep(5) pid = get_pid('fala_wl') st, op = commands.getstatusoutput('cat /proc/%s/cmdline' %pid) self.assert_(op.split('\0')[0] == "fala_wl",'Application name is incorrect') @@ -913,15 +912,6 @@ class launcher_tests (unittest.TestCase): self.assert_(op == '0',"oom.adj of the launched process is not 0") kill_process(PREFERED_APP) - def test_temporary_process_name(self): - """ - Test TemporaryProcessName - """ - - st, op = commands.getstatusoutput('invoker --type=e --wait-term /usr/bin/fala_status') - time.sleep(1) - - def test_oom_adj_minus_one(self): """ Test that oom.adj is -1 for launched application process when using @@ -936,10 +926,21 @@ class launcher_tests (unittest.TestCase): st, op = commands.getstatusoutput('cat /proc/%s/oom_adj' % pid) - self.assert_(op == '-1', "oom.adj of the launched process is not -1") + self.assert_(op == '-2', "oom.adj of the launched process is not -1") kill_process(PREFERED_APP) + def test_writable_executable_mem(self): + """ + Test that applauncherd does not have the writable and executable memory + """ + + pid = get_pid('applauncherd') + st, op = commands.getstatusoutput("grep wx /proc/%s/smaps" %pid) + debug("The value of status is %d" %st) + debug("The value of output is %s" %op) + self.assert_(st != 0, "applauncherd has writable and executable memory") + # main if __name__ == '__main__': # When run with testrunner, for some reason the PATH doesn't include