[Erp5-report] r31308 leonardo - /erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py

[nobody at svn.erp5.org]

Author: leonardo
Date: Tue Dec 15 14:10:39 2009
New Revision: 31308

URL: http://svn.erp5.org?rev=31308&view=rev
Log:
Restore deleted portal_activities on beforeTearDown

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

Modified: erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py?rev=31308&r1=31307&r2=31308&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py [utf8] Tue Dec 15 14:10:39 2009
@@ -74,8 +74,16 @@
       order = module.newContent(id='1', portal_type='Purchase Order')
     self._catch_log_errors(ignored_level=PROBLEM)
 
+  portal_activities_backup = None
+
   def beforeTearDown(self):
     self._ignore_log_errors()
+    if self.portal_activities_backup is not None:
+      self.portal._setObject('portal_activities',
+                             self.portal_activities_backup)
+      get_transaction().commit()
+      del self.portal_activities_backup
+    return ERP5TypeTestCase.beforeTearDown(self)
 
 
   def test_01_RenameCellRange(self, quiet=quiet):
@@ -198,8 +206,7 @@
     portal = self.getPortal()
     module = portal.purchase_order_module
     if not active:
-      # FIXME: deleting portal_activities prevent from running another test
-      # after this one (because this methods commits the transaction)
+      self.portal_activities_backup = portal._getOb('portal_activities')
       portal._delObject('portal_activities')
       module.recursiveImmediateReindexObject()
     else: