[Erp5-report] r28893 - in /erp5/trunk/products/ERP5Type: ./ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Sep 10 12:53:50 2009
New Revision: 28893

URL: http://svn.erp5.org?rev=28893&view=rev
Log:
remove --erp5_sql_deferred_connection_string argument, because we no longer allow
to select different connection strings for normal and deferred connections
since 28891

Modified:
    erp5/trunk/products/ERP5Type/   (props changed)
    erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
    erp5/trunk/products/ERP5Type/tests/runUnitTest.py

Propchange: erp5/trunk/products/ERP5Type/
------------------------------------------------------------------------------
    bzr:see-revprops = 28893

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=28893&r1=28892&r2=28893&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Thu Sep 10 12:53:50 2009
@@ -199,12 +199,6 @@
     if erp5_sql_transactionless_connection_string:
       connection_string_dict['erp5_sql_transactionless_connection_string'] = \
                               erp5_sql_transactionless_connection_string
-  erp5_sql_deferred_connection_string = os.environ.get(
-                            'erp5_sql_deferred_connection_string',
-                            os.environ.get('erp5_sql_connection_string'))
-  if erp5_sql_deferred_connection_string:
-    connection_string_dict['erp5_sql_deferred_connection_string'] = \
-                                erp5_sql_deferred_connection_string
   return connection_string_dict
 
 

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=28893&r1=28892&r2=28893&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Thu Sep 10 12:53:50 2009
@@ -40,10 +40,6 @@
                              ZSQL Connection string for
                              cmf_activity_sql_connection (if unset, defaults to
                              erp5_sql_connection_string)
-  --erp5_sql_deferred_connection_string=STRING 
-                             ZSQL Connection string for
-                             erp5_sql_deferred_connection (if unset, defaults
-                             to erp5_sql_connection_string)
   --email_from_address=STRING
                              Initialise the email_from_address property of the
                              portal, by default, CMFActivity failures are sent
@@ -393,7 +389,6 @@
         "bt5_path=",
         "recreate_catalog=", "erp5_sql_connection_string=",
         "cmf_activity_sql_connection_string=",
-        "erp5_sql_deferred_connection_string=",
         "erp5_catalog_storage=",
         "save",
         "load",
@@ -442,8 +437,6 @@
       os.environ["erp5_sql_connection_string"] = arg
     elif opt == "--cmf_activity_sql_connection_string":
       os.environ["cmf_activity_sql_connection_string"] = arg
-    elif opt == "--erp5_sql_deferred_connection_string":
-      os.environ["erp5_sql_deferred_connection_string"] = arg
     elif opt == "--email_from_address":
       os.environ["email_from_address"] = arg
     elif opt == "--save":