[Erp5-report] r37608 gabriel - /erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Aug  6 18:10:44 2010
New Revision: 37608

URL: http://svn.erp5.org?rev=37608&view=rev
Log:
refactor to be able to pass the configuration dynamically

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

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py?rev=37608&r1=37607&r2=37608&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/cloudoooTestCase.py [utf8] Fri Aug  6 18:10:44 2010
@@ -27,7 +27,7 @@
 ##############################################################################
 
 import unittest
-from sys import path
+from sys import path, argv
 from ConfigParser import ConfigParser
 from os.path import join, exists, dirname
 from os import environ, putenv
@@ -45,12 +45,13 @@ def make_suite(test_case):
   suite.addTest(unittest.makeSuite(test_case))
   return suite
 
-def loadConfig(path=None):
-  conf_path = path or join(testcase_path, "..", "samples/cloudooo.conf")
-  config.read(conf_path)
+def loadConfig(path):
+  config.read(path)
 
 def startFakeEnvironment(start_openoffice=True, conf_path=None):
   """Create a fake environment"""
+  if not conf_path and len(argv) >=1:
+    conf_path = argv[1]
   loadConfig(conf_path)
   uno_path = config.get("app:main", "uno_path")
   path_dir_run_cloudooo = config.get("app:main", "path_dir_run_cloudooo")
@@ -115,7 +116,6 @@ class cloudoooTestCase(unittest.TestCase
   def setUp(self):
     """Creates a environment to run the tests. Is called always before the
     tests."""
-    loadConfig()
     self.hostname = config.get("server:main", "host")
     self.cloudooo_port = config.get("server:main", "port")
     self.openoffice_port = config.get("app:main", "openoffice_port")