[Erp5-report] r42270 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Jan 12 16:54:37 CET 2011
Author: gabriel
Date: Wed Jan 12 16:54:36 2011
New Revision: 42270
URL: http://svn.erp5.org?rev=42270&view=rev
Log:
use SIGQUIT to stop all processes(paster, Xvfb and OpenOffice.org)
Modified:
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py?rev=42270&r1=42269&r2=42270&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] Wed Jan 12 16:54:36 2011
@@ -8,6 +8,7 @@ from subprocess import Popen
from ConfigParser import ConfigParser
from os import chdir, path, environ, curdir, remove
from psutil import Process
+from signal import SIGQUIT
ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
@@ -25,6 +26,7 @@ def exit(msg):
sys.stderr.write(msg)
sys.exit(0)
+
def run():
parser = ArgumentParser(description="Unit Test Runner for Cloudooo")
parser.add_argument('server_cloudooo_conf')
@@ -83,7 +85,8 @@ def run():
try:
TestRunner(verbosity=2).run(suite)
finally:
- process.terminate()
+ process.send_signal(SIGQUIT)
+ process.wait()
elif OPENOFFICE:
chdir(ENVIRONMENT_PATH)
openoffice, xvfb = startFakeEnvironment(conf_path=server_cloudooo_conf)
More information about the Erp5-report
mailing list