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

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Mar 16 22:08:14 2010
New Revision: 33770

URL: http://svn.erp5.org?rev=33770&view=rev
Log:

Added new argument to Replace the MailHost by DummyMailHost. This prevent the instance send emails. 

Also introduced one easy way to replace MailHost by DummyMailHost: ERP5TypeTestCase._setUpDummyMailHost.


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=33770&r1=33769&r2=33770&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Tue Mar 16 22:08:14 2010
@@ -491,6 +491,7 @@
         cfg.instancehome = os.environ['COPY_OF_INSTANCE_HOME']
         App.config.setConfiguration(cfg)
 
+      use_dummy_mail_host = os.environ.get('use_dummy_mail_host', 0)
       template_list = self.getBusinessTemplateList()
       erp5_catalog_storage = os.environ.get('erp5_catalog_storage',
                                             'erp5_mysql_innodb_catalog')
@@ -523,7 +524,8 @@
                          create_activities=create_activities,
                          quiet=install_bt5_quiet,
                          hot_reindexing=hot_reindexing,
-                         erp5_catalog_storage=erp5_catalog_storage)
+                         erp5_catalog_storage=erp5_catalog_storage, 
+                         use_dummy_mail_host=use_dummy_mail_host)
       PortalTestCase.setUp(self)
       global current_app
       current_app = self.app
@@ -560,6 +562,14 @@
                                     _getConnectionStringDict().items():
         connection_name = connection_string_name.replace('_string', '')
         getattr(portal, connection_name).edit('', connection_string)
+
+    def _setUpDummyMailHost(self):
+      """Replace Original Mail Host by Dummy Mail Host.
+      """
+      from Products.ERP5Type.tests.utils import DummyMailHost
+      if 'MailHost' in self.portal.objectIds():
+        self.portal.manage_delObjects(['MailHost'])
+        self.portal._setObject('MailHost', DummyMailHost('MailHost'))
 
     def _updateConversionServerConfiguration(self):
       """Update conversion server (Oood) at default site preferences.
@@ -900,7 +910,8 @@
                      light_install=1,
                      create_activities=1,
                      hot_reindexing=1,
-                     erp5_catalog_storage='erp5_mysql_innodb_catalog'):
+                     erp5_catalog_storage='erp5_mysql_innodb_catalog',
+                     use_dummy_mail_host=0):
       '''
         Creates an ERP5 site.
         business_template_list must be specified correctly
@@ -993,6 +1004,9 @@
             uf._doAddUser('ERP5TypeTestCase', '', ['Manager', 'Member', 'Assignee',
                             'Assignor', 'Author', 'Auditor', 'Associate'], [])
             user = uf.getUserById('ERP5TypeTestCase').__of__(uf)
+
+            if use_dummy_mail_host:
+              self._setUpDummyMailHost()
 
             setup_once = getattr(self, 'setUpOnce', None)
             if setup_once is not None and \

Modified: erp5/trunk/products/ERP5Type/tests/runUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/runUnitTest.py?rev=33770&r1=33769&r2=33770&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/runUnitTest.py [utf8] Tue Mar 16 22:08:14 2010
@@ -90,6 +90,11 @@
 			    (Oood), the value will be stored at default preference. 
 			    By default 8008 is used.
 
+  --use_dummy_mail_host
+                            Replace the MailHost by DummyMailHost. This prevent
+			    the instance send emails. By default Original MailHost 
+			    is used.
+
 """
 
 def getUnitTestFile():
@@ -510,6 +515,7 @@
         "enable_full_indexing=",
         "run_only=",
         "update_only=",
+        "use_dummy_mail_host", 
         "update_business_templates"] )
   except getopt.GetoptError, msg:
     usage(sys.stderr, msg)
@@ -574,6 +580,8 @@
       os.environ["conversion_server_hostname"] = arg
     elif opt == "--conversion_server_port":
       os.environ["conversion_server_port"] = arg
+    elif opt == "--use_dummy_mail_host":
+      os.environ["use_dummy_mail_host"] = "1"
 
   test_list = args
   if not test_list: