[Erp5-report] r16008 - in /erp5/trunk/products: ERP5/tests/ ERP5Type/tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep  3 09:36:06 2007
New Revision: 16008

URL: http://svn.erp5.org?rev=16008&view=rev
Log:
don't use immediate reindex

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

Modified: erp5/trunk/products/ERP5/tests/testERP5HR.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5HR.py?rev=16008&r1=16007&r2=16008&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5HR.py (original)
+++ erp5/trunk/products/ERP5/tests/testERP5HR.py Mon Sep  3 09:36:06 2007
@@ -232,7 +232,6 @@
               category_type = 'Category'
             base_path_obj.newContent( portal_type       = category_type
                                     , id                = category_id
-                                    , immediate_reindex = 1
                                     )
           base_path_obj = base_path_obj[category_id]
           is_base_category = False
@@ -273,7 +272,6 @@
     portal_type = 'Organisation'
     organisation_module = self.portal.getDefaultModule(portal_type)
     organisation = organisation_module.newContent(portal_type=portal_type,
-                                                  immediate_reindex=1,
                                                   title='A new organisation')
     sequence.edit(organisation = organisation)
 
@@ -469,7 +467,6 @@
     portal_type = 'Person'
     person_module = self.portal.getDefaultModule(portal_type)
     person = person_module.newContent( portal_type       = portal_type
-                                     , immediate_reindex = 1
                                      )
     sequence.edit(person = person)
 

Modified: erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py?rev=16008&r1=16007&r2=16008&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py (original)
+++ erp5/trunk/products/ERP5Type/tests/testXMLMatrix.py Mon Sep  3 09:36:06 2007
@@ -188,15 +188,21 @@
         self.assertEqual(getattr(cell, 'test_id', None), value_list[i])
       i += 1
 
-  def checkSetCellRangeAndCatalog(self,active=1):
+  def checkSetCellRangeAndCatalog(self, active=1):
     """
     Tests if set Cell range do well catalog and uncatalog
     """
     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)
       portal._delObject('portal_activities')
-    module = portal.purchase_order_module
-    module.recursiveImmediateReindexObject()
+      module.recursiveImmediateReindexObject()
+    else:
+      module.recursiveReindexObject()
+      get_transaction().commit()
+      self.tic()
     catalog = portal.portal_catalog
 
     order = module._getOb('1')