[Erp5-report] r33599 rafael - /erp5/trunk/products/ERP5Type/tests/

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Mar 10 21:58:17 2010
New Revision: 33599

URL: http://svn.erp5.org?rev=33599&view=rev
Log:
Allow use --conversion_server_hostname and --conversion_server_port for set oood server and port number. 

  - By default localhost and 8008 is used. 
  - It just overwrite default values at default_site_preference (where localhost and 8008) is set. 
  - Tests that has new preferences (like testDms) the followed method can be used to get the values passed by arguments.
   from Products.ERP5Type.tests.ERP5TypeTestCase import _getConversionServerDict



Modified:
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
    erp5/trunk/products/ERP5Type/tests/runUnitTest.py

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=33599&r1=33598&r2=33599&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Wed Mar 10 21:58:17 2010
@@ -244,6 +244,16 @@
                               erp5_sql_transactionless_connection_string
   return connection_string_dict
 
+def _getConversionServerDict():
+  """ Returns a dict with hostname and port for Conversion Server (Oood)
+  """
+  conversion_server_hostname = os.environ.get('conversion_server_hostname', 
+                                              'localhost')
+  conversion_server_port = os.environ.get('conversion_server_port',
+                                          '8008')
+  return dict(hostname=conversion_server_hostname, 
+              port=int(conversion_server_port))
+
 
 def profile_if_environ(environment_var_name):
     if int(os.environ.get(environment_var_name, 0)):
@@ -518,6 +528,7 @@
       global current_app
       current_app = self.app
       self._updateConnectionStrings()
+      self._updateConversionServerConfiguration()
 
     def afterSetUp(self):
       '''Called after setUp() has completed. This is
@@ -550,6 +561,14 @@
                                     _getConnectionStringDict().items():
         connection_name = connection_string_name.replace('_string', '')
         getattr(portal, connection_name).edit('', connection_string)
+
+    def _updateConversionServerConfiguration(self):
+      """Update conversion server (Oood) at default site preferences.
+      """
+      conversion_dict = _getConversionServerDict()
+      preference = self.portal.portal_preferences.default_site_preference
+      preference.setPreferredOoodocServerAddress(conversion_dict['hostname'])
+      preference.setPreferredOoodocServerPortNumber(conversion_dict['port'])
 
     def _recreateCatalog(self, quiet=0):
       """Clear activities and catalog and recatalog everything.

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=33599&r1=33598&r2=33599&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Wed Mar 10 21:58:17 2010
@@ -79,6 +79,17 @@
                              for performance reasons. Provide list of documents
                              (delimited with comas) for which we want to force
                              indexing. This can only be for now 'portal_types'
+  
+  --conversion_server_hostname=STRING
+                            Hostname used to connect to conversion server (Oood), 
+			    this value will stored at default preference. By default 
+			    localhost is used. 
+
+  --conversion_server_port=STRING
+                            Port number used to connect to conversion server
+			    (Oood), the value will be stored at default preference. 
+			    By default 8008 is used.
+
 """
 
 def getUnitTestFile():
@@ -490,6 +501,8 @@
         "bt5_path=",
         "recreate_catalog=", "erp5_sql_connection_string=",
         "cmf_activity_sql_connection_string=",
+        "conversion_server_port=", 
+        "conversion_server_hostname=",
         "erp5_catalog_storage=",
         "save",
         "load",
@@ -557,6 +570,10 @@
       os.environ["update_business_templates"] = "1"
     elif opt == "--update_business_templates":
       os.environ["update_business_templates"] = "1"
+    elif opt == "--conversion_server_hostname":
+      os.environ["conversion_server_hostname"] = arg
+    elif opt == "--conversion_server_port":
+      os.environ["conversion_server_port"] = arg
 
   test_list = args
   if not test_list: