[Erp5-report] r31320 leonardo - /erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Tue Dec 15 20:54:16 2009
New Revision: 31320

URL: http://svn.erp5.org?rev=31320&view=rev
Log:
Drop left-over activities between tests

On Zope 2.12, in test files with multiple test classes, activities from one test class are reactivated on the next test class.

This doesn't happen on Zope 2.8 by pure accident: during portal construction, the skin is not properly configured, and so
activities are not reactivated as they are on Zope 2.12.


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

Modified: erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py?rev=31320&r1=31319&r2=31320&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/ERP5TypeTestCase.py [utf8] Tue Dec 15 20:54:16 2009
@@ -973,10 +973,16 @@
     def beforeClose(self):
       PortalTestCase.beforeClose(self)
       try:
+        portal_activities = self.portal.portal_activities
+        # Drop remaining activities.
+        count = portal_activities.countMessage()
+        portal_activities.manageClearActivities()
+        if count:
+          LOG('Products.ERP5Type.tests.ERP5TypeTestCase.beforeClose', DEBUG,
+              'dropped %d left-over activity messages' % (count,))
         # portal_activities.process_timer automatically registers current node
         # (localhost:<random_port>). We must unregister it so that Data.fs can
         # be reused without reconfiguring portal_activities.
-        portal_activities = self.portal.portal_activities
         del portal_activities.distributingNode
         del portal_activities._nodes
         transaction.commit()