[Erp5-report] r42230 jm - in /erp5/trunk/products: CMFActivity/tests/ ERP5Type/tests/

[nobody at svn.erp5.org]

Author: jm
Date: Tue Jan 11 18:28:19 2011
New Revision: 42230

URL: http://svn.erp5.org?rev=42230&view=rev
Log:
Unit tests: execute activities at most 2 times before failing

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

Modified: erp5/trunk/products/CMFActivity/tests/testCMFActivity.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/tests/testCMFActivity.py?rev=42230&r1=42229&r2=42230&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] (original)
+++ erp5/trunk/products/CMFActivity/tests/testCMFActivity.py [utf8] Tue Jan 11 18:28:19 2011
@@ -101,6 +101,10 @@ class TestCMFActivity(ERP5TypeTestCase, 
 
   def afterSetUp(self):
     super(TestCMFActivity, self).afterSetUp()
+    from Products.CMFActivity.ActivityRuntimeEnvironment import BaseMessage
+    # Set 'max_retry' to a known value so that we can test the feature
+    BaseMessage.max_retry = property(lambda self:
+      self.activity_kw.get('max_retry', 5))
     self.login()
     portal = self.portal
     # trap outgoing e-mails

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=42230&r1=42229&r2=42230&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Tue Jan 11 18:28:19 2011
@@ -485,6 +485,12 @@ class ERP5TypeTestCase(ProcessingNodeTes
       '''Sets up the fixture. Do not override,
          use the hooks instead.
       '''
+      from Products.CMFActivity.ActivityRuntimeEnvironment import BaseMessage
+      # Activities in unit tests shall never fail.
+      # Let's be a litte tolerant for the moment.
+      BaseMessage.max_retry = property(lambda self:
+        self.activity_kw.get('max_retry', 1))
+
       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',