Commit ea2f68ed authored by Gabriel Monnerat's avatar Gabriel Monnerat

use SIGQUIT to stop all processes(paster, Xvfb and OpenOffice.org)

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk/utils@42270 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 48b6650d
...@@ -8,6 +8,7 @@ from subprocess import Popen ...@@ -8,6 +8,7 @@ from subprocess import Popen
from ConfigParser import ConfigParser from ConfigParser import ConfigParser
from os import chdir, path, environ, curdir, remove from os import chdir, path, environ, curdir, remove
from psutil import Process from psutil import Process
from signal import SIGQUIT
ENVIRONMENT_PATH = path.abspath(path.dirname(__file__)) ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
...@@ -25,6 +26,7 @@ def exit(msg): ...@@ -25,6 +26,7 @@ def exit(msg):
sys.stderr.write(msg) sys.stderr.write(msg)
sys.exit(0) sys.exit(0)
def run(): def run():
parser = ArgumentParser(description="Unit Test Runner for Cloudooo") parser = ArgumentParser(description="Unit Test Runner for Cloudooo")
parser.add_argument('server_cloudooo_conf') parser.add_argument('server_cloudooo_conf')
...@@ -83,7 +85,8 @@ def run(): ...@@ -83,7 +85,8 @@ def run():
try: try:
TestRunner(verbosity=2).run(suite) TestRunner(verbosity=2).run(suite)
finally: finally:
process.terminate() process.send_signal(SIGQUIT)
process.wait()
elif OPENOFFICE: elif OPENOFFICE:
chdir(ENVIRONMENT_PATH) chdir(ENVIRONMENT_PATH)
openoffice, xvfb = startFakeEnvironment(conf_path=server_cloudooo_conf) openoffice, xvfb = startFakeEnvironment(conf_path=server_cloudooo_conf)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment