[Erp5-report] r41524 jm - /erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py

[nobody at svn.erp5.org]

Author: jm
Date: Sat Dec 18 18:32:00 2010
New Revision: 41524

URL: http://svn.erp5.org?rev=41524&view=rev
Log:
ProcessingNodeTestCase: catch and log errors when invoking Activity Tool

Modified:
    erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py

Modified: erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py?rev=41524&r1=41523&r2=41524&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ProcessingNodeTestCase.py [utf8] Sat Dec 18 18:32:00 2010
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-import base64, errno, select, socket, time
+import base64, errno, select, socket, sys, time
 from threading import Thread
 import Lifetime
 import transaction
 from BTrees.OIBTree import OIBTree
 from Testing import ZopeTestCase
+from zLOG import LOG, ERROR
 from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY
 from Products.ERP5Type.tests import backportUnittest
 from Products.ERP5Type.tests.utils import createZServer
@@ -190,6 +191,11 @@ class ProcessingNodeTestCase(backportUni
           portal = self.app[self.app.test_portal_name]
         except (AttributeError, KeyError):
           continue
-        portal.portal_activities.process_timer(None, None)
+        try:
+          portal.portal_activities.process_timer(None, None)
+        except (KeyboardInterrupt, SystemExit): # BACK: Not needed for
+          raise                                 #       Python >= 2.5
+        except Exception:
+          LOG('Invoking Activity Tool', ERROR, '', error=sys.exc_info())
     except KeyboardInterrupt:
       pass