Commit 5948dc7c authored by iv's avatar iv

ERP5Workflow: getMessageList shows activities up to a limit of 1000

testERP5Catalog was failing because there was more than 1000 activities in portal_activities
and the one that should have been invoked was at the end of the list
set the limit to None, and only check the interesting activities
Also, add SQLCatalog_deferFullTextIndexActivity to activities to
play.
parent b25f8bf9
...@@ -1248,11 +1248,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -1248,11 +1248,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
self.commit() self.commit()
portal_activities = self.getActivityTool() portal_activities = self.getActivityTool()
for i in range(0,100): for i in range(0,100):
message_list = portal_activities.getMessageList() message_list = portal_activities.getMessageList(method_id=method_id_list, count=None)
for message in message_list: for message in message_list:
#if message.method_id=='_setHotReindexingState': #if message.method_id=='_setHotReindexingState':
# import pdb;pdb.set_trace() # import pdb;pdb.set_trace()
if message.method_id in method_id_list:
try: try:
portal_activities.manageInvoke(message.object_path,message.method_id) portal_activities.manageInvoke(message.object_path,message.method_id)
except ActivityFlushError,m: except ActivityFlushError,m:
...@@ -1375,11 +1374,13 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor): ...@@ -1375,11 +1374,13 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
'immediateReindexObject', 'immediateReindexObject',
'Folder_reindexObjectList', 'Folder_reindexObjectList',
'unindexObject', 'unindexObject',
'SQLCatalog_deferFullTextIndexActivity',
'recursiveImmediateReindexObject')) 'recursiveImmediateReindexObject'))
# try to delete objects in double indexing state # try to delete objects in double indexing state
module.manage_delObjects(ids=[self.organisation2.getId()]) module.manage_delObjects(ids=[self.organisation2.getId()])
self.playActivityList(('immediateReindexObject', self.playActivityList(('immediateReindexObject',
'unindexObject', 'unindexObject',
'SQLCatalog_deferFullTextIndexActivity',
'recursiveImmediateReindexObject', 'recursiveImmediateReindexObject',
'playBackRecordedObjectList', 'playBackRecordedObjectList',
'getId', 'getId',
......
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