[Erp5-report] r31888 leonardo - /erp5/trunk/products/CMFActivity/tests/testCMFActivity.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Thu Jan 21 17:33:10 2010
New Revision: 31888

URL: http://svn.erp5.org?rev=31888&view=rev
Log:
capture outgoing e-mails

Modified:
    erp5/trunk/products/CMFActivity/tests/testCMFActivity.py

Modified: erp5/trunk/products/CMFActivity/tests/testCMFActivity.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/tests/testCMFActivity.py?rev=31888&r1=31887&r2=31888&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] Thu Jan 21 17:33:10 2010
@@ -31,6 +31,7 @@
 
 from Testing import ZopeTestCase
 from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
+from Products.ERP5Type.tests.utils import DummyMailHost
 from Products.CMFActivity.ActiveObject import INVOKE_ERROR_STATE,\
                                               VALIDATE_ERROR_STATE
 from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY
@@ -87,8 +88,15 @@
     return getattr(self.getPortal(), 'organisation', None)
 
   def afterSetUp(self):
+    super(TestCMFActivity, self).afterSetUp()
     self.login()
-    portal = self.getPortal()
+    portal = self.portal
+    # trap outgoing e-mails
+    self.oldMailHost = getattr(self.portal, 'MailHost', None)
+    if self.oldMailHost is not None:
+      self.portal.manage_delObjects(['MailHost'])
+      self.portal._setObject('MailHost', DummyMailHost('MailHost'))
+    
     # remove all message in the message_table because
     # the previous test might have failed
     message_list = portal.portal_activities.getMessageList()
@@ -103,13 +111,11 @@
     organisation_module = self.getOrganisationModule()
     if not(organisation_module.hasContent(self.company_id)):
       o1 = organisation_module.newContent(id=self.company_id)
-    get_transaction().commit()
-    self.tic()
+    self.stepTic()
     # import it now that Products.ERP5 has been initialized
     global Organisation
     from Products.ERP5Type.Document.Organisation import Organisation as Org
     Organisation = Org
-    
 
   def login(self, quiet=0, run=run_all_test):
     uf = self.getPortal().acl_users