CMFActivity: do not bypass the max_retry parameter for activities that timeout

See merge request !1880

product/CMFActivity/Activity/SQLBase.py

@@ -50,7 +50,7 @@ from Products.CMFActivity.ActivityRuntimeEnvironment import (
 from .Queue import Queue, VALIDATION_ERROR_DELAY
 from Products.CMFActivity.Errors import ActivityFlushError
 from Products.ERP5Type import Timeout
-from Products.ERP5Type.Timeout import TimeoutReachedError, Deadline
+from Products.ERP5Type.Timeout import Deadline
 import six
 
 # Stop validating more messages when this limit is reached
@@ -1094,8 +1094,7 @@ CREATE TABLE %s (
         else:
           max_retry = m.max_retry
           retry = m.line.retry
-          if (max_retry is not None and retry >= max_retry) or \
-              m.exc_type == TimeoutReachedError:
+          if max_retry is not None and retry >= max_retry:
             # Always notify when we stop retrying.
             notify_user_list.append((m, False))
             final_error_uid_list.append(uid)

product/CMFActivity/tests/testCMFActivity.py

@@ -2794,7 +2794,6 @@ return [x.getObject() for x in context.portal_catalog(limit=100)]
     with self.assertRaises(RuntimeError):
       self.tic()
     message, = self.getMessageList('SQLDict')
-    self.assertEqual(message.retry, 0)
     self.deleteMessageList(
       'SQLDict',
       [message],