Commit 483bcf62 authored by Vincent Pelletier's avatar Vincent Pelletier

testRule: Instead of (unreliably) preventing indexation, just unindex.

Intercepting an indexation activity is not reliable, as multiple indexation
activities may have been spawned, and the wrong may be intercepted here.
So instead, explicitly unindex the document intended to not exist in
catalog.
parent 3be9e1c3
...@@ -685,10 +685,11 @@ return context.generatePredicate( ...@@ -685,10 +685,11 @@ return context.generatePredicate(
self.getRule('default_delivery_rule').validate() self.getRule('default_delivery_rule').validate()
self.tic() self.tic()
self.pl.updateSimulation(create_root=1) self.pl.updateSimulation(create_root=1)
self.tic(stop_condition=lambda message_list: 1 == sum(1 self.tic()
for m in message_list if m.method_id == 'immediateReindexObject'))
root_applied_rule, = self.pl.getCausalityRelatedValueList() root_applied_rule, = self.pl.getCausalityRelatedValueList()
sm, = root_applied_rule.objectValues() sm, = root_applied_rule.objectValues()
sm.unindexObject()
self.tic()
line = sm.getDeliveryValue() line = sm.getDeliveryValue()
self.assertEqual([sm], line.getDeliveryRelatedValueList()) self.assertEqual([sm], line.getDeliveryRelatedValueList())
self.assertEqual([], [x.getObject() for x in self.portal.portal_catalog self.assertEqual([], [x.getObject() for x in self.portal.portal_catalog
...@@ -701,15 +702,14 @@ return context.generatePredicate( ...@@ -701,15 +702,14 @@ return context.generatePredicate(
should be deleted at some point. should be deleted at some point.
""" """
root_applied_rule = self._slowReindex() root_applied_rule = self._slowReindex()
r, = self.portal.cmf_activity_sql_connection.manage_test(
'update message set priority = 127\0select * from message')
self.assertEqual(r.processing_node, -1)
line_id, = self.pl.objectIds() line_id, = self.pl.objectIds()
self.pl._delObject(line_id) self.pl._delObject(line_id)
line = self.pl.newContent(portal_type=self.packing_list_line_portal_type, line = self.pl.newContent(portal_type=self.packing_list_line_portal_type,
quantity=1) quantity=1)
self.tic() self.tic()
sm, = root_applied_rule.objectValues() sm, = root_applied_rule.objectValues()
sm.reindexObject()
self.tic()
self.assertEqual(line, sm.getDeliveryValue()) self.assertEqual(line, sm.getDeliveryValue())
def test_14_indexRelated(self): def test_14_indexRelated(self):
...@@ -718,7 +718,6 @@ return context.generatePredicate( ...@@ -718,7 +718,6 @@ return context.generatePredicate(
This actually tests the zodb-indexing of delivery category. This actually tests the zodb-indexing of delivery category.
""" """
root_applied_rule = self._slowReindex() root_applied_rule = self._slowReindex()
self.portal.cmf_activity_sql_connection.manage_test('delete from message')
self.pl.updateSimulation(index_related=1) self.pl.updateSimulation(index_related=1)
self.tic() self.tic()
sm, = root_applied_rule.objectValues() sm, = root_applied_rule.objectValues()
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment