[Erp5-report] r40340 gabriel - in /erp5/trunk/utils/cloudooo: ./ cloudooo/tests/

[nobody at svn.erp5.org]

Author: gabriel
Date: Wed Nov 17 19:19:08 2010
New Revision: 40340

URL: http://svn.erp5.org?rev=40340&view=rev
Log:
add configuration to create script that run runCloudOOoUnitTest.py

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/runCloudOOoUnitTest.py
    erp5/trunk/utils/cloudooo/setup.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py?rev=40340&r1=40339&r2=40340&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py [utf8] Wed Nov 17 19:19:08 2010
@@ -124,6 +124,9 @@ class cloudoooTestCase(unittest.TestCase
   def setUp(self):
     """Creates a environment to run the tests. Is called always before the
     tests."""
+    server_cloudooo_conf = environ.get("server_cloudooo_conf", None)
+    if server_cloudooo_conf is not None:
+      config.read(server_cloudooo_conf)
     self.hostname = config.get("server:main", "host")
     self.cloudooo_port = config.get("server:main", "port")
     self.openoffice_port = config.get("app:main", "openoffice_port")

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/runCloudOOoUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/runCloudOOoUnitTest.py?rev=40340&r1=40339&r2=40340&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/runCloudOOoUnitTest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/runCloudOOoUnitTest.py [utf8] Wed Nov 17 19:19:08 2010
@@ -6,7 +6,7 @@ from getopt import getopt, GetoptError
 from time import sleep
 from cloudooo.utils import socketStatus
 from ConfigParser import ConfigParser
-from os import chdir, path
+from os import chdir, path, environ
 from subprocess import Popen
 
 ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
@@ -71,6 +71,7 @@ def run():
       cloudooo_runner = arg
     elif opt == "--server_cloudooo_conf":
       server_cloudooo_conf = arg
+      environ["server_cloudooo_conf"] = arg
     elif opt == "--timeout_limit":
       timeout_limit = arg
   
@@ -88,10 +89,6 @@ def run():
   server_port = int(config.get("server:main", "port"))
   run_dir = config.get('app:main', 'working_path')
 
-  test_name = sys.argv[-1]
-  if not path.exists(path.join(ENVIRONMENT_PATH, '%s.py' % test_name)):
-    exit("%s not exists\n" % test_name)
-
   if DAEMON:
     loadConfig(server_cloudooo_conf)
     Popen([cloudooo_runner, 'start']).communicate()

Modified: erp5/trunk/utils/cloudooo/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/setup.py?rev=40340&r1=40339&r2=40340&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/setup.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/setup.py [utf8] Wed Nov 17 19:19:08 2010
@@ -40,5 +40,6 @@ setup(name='cloudooo',
       [console_scripts]
       cloudooo_tester = cloudooo.bin.cloudooo_tester:main
       echo_cloudooo_conf = cloudooo.bin.echo_cloudooo_conf:main
+      runCloudOOoUnitTest = cloudooo.tests.runCloudOOoUnitTest:run
       """,
       )