Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Mikolaï Krol
erp5
Commits
3ca5bf97
Commit
3ca5bf97
authored
Jan 23, 2019
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CMFActivity: even more test clean-up
parent
cee3e728
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
180 additions
and
519 deletions
+180
-519
product/CMFActivity/tests/testCMFActivity.py
product/CMFActivity/tests/testCMFActivity.py
+180
-519
No files found.
product/CMFActivity/tests/testCMFActivity.py
View file @
3ca5bf97
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
import
inspect
import
inspect
import
unittest
import
unittest
from
functools
import
wraps
from
Products.ERP5Type.tests.utils
import
LogInterceptor
from
Products.ERP5Type.tests.utils
import
LogInterceptor
from
Testing
import
ZopeTestCase
from
Testing
import
ZopeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
...
@@ -61,6 +61,15 @@ import socket
...
@@ -61,6 +61,15 @@ import socket
class
CommitFailed
(
Exception
):
class
CommitFailed
(
Exception
):
pass
pass
def
for_each_activity
(
wrapped
):
def
wrapper
(
self
):
getMessageList
=
self
.
portal
.
portal_activities
.
getMessageList
for
activity
in
ActivityTool
.
activity_dict
:
wrapped
(
self
,
activity
)
self
.
abort
()
self
.
assertFalse
(
getMessageList
())
return
wraps
(
wrapped
)(
wrapper
)
def
registerFailingTransactionManager
(
*
args
,
**
kw
):
def
registerFailingTransactionManager
(
*
args
,
**
kw
):
from
Shared.DC.ZRDB.TM
import
TM
from
Shared.DC.ZRDB.TM
import
TM
class
dummy_tm
(
TM
):
class
dummy_tm
(
TM
):
...
@@ -109,6 +118,30 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -109,6 +118,30 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
o1
=
organisation_module
.
newContent
(
id
=
self
.
company_id
)
o1
=
organisation_module
.
newContent
(
id
=
self
.
company_id
)
self
.
tic
()
self
.
tic
()
def
tearDown
(
self
):
# Override ERP5 tearDown to make sure that tests do not leave unprocessed
# activity messages. We are testing CMFActivity so it's important to check
# that everything works as expected on this subject.
try
:
if
self
.
_resultForDoCleanups
.
wasSuccessful
():
getMessageList
=
self
.
portal
.
portal_activities
.
getMessageList
self
.
assertFalse
(
getMessageList
())
# Also check if a test drop them without committing.
self
.
abort
()
self
.
assertFalse
(
getMessageList
())
finally
:
ERP5TypeTestCase
.
tearDown
(
self
)
def
getMessageList
(
self
,
activity
,
**
kw
):
return
ActivityTool
.
activity_dict
[
activity
].
getMessageList
(
self
.
portal
.
portal_activities
,
**
kw
)
def
deleteMessageList
(
self
,
activity
,
message_list
):
ActivityTool
.
activity_dict
[
activity
].
deleteMessageList
(
self
.
portal
.
portal_activities
.
getSQLConnection
(),
[
m
.
uid
for
m
in
message_list
])
self
.
commit
()
def
login
(
self
):
def
login
(
self
):
uf
=
self
.
portal
.
acl_users
uf
=
self
.
portal
.
acl_users
uf
.
_doAddUser
(
'seb'
,
''
,
[
'Manager'
],
[])
uf
.
_doAddUser
(
'seb'
,
''
,
[
'Manager'
],
[])
...
@@ -116,7 +149,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -116,7 +149,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
user
=
uf
.
getUserById
(
'seb'
).
__of__
(
uf
)
user
=
uf
.
getUserById
(
'seb'
).
__of__
(
uf
)
newSecurityManager
(
None
,
user
)
newSecurityManager
(
None
,
user
)
def
InvokeAndCancelActivity
(
self
,
activity
):
@
for_each_activity
def
testInvokeAndCancelActivity
(
self
,
activity
):
"""
"""
Simple test where we invoke and cancel an activity
Simple test where we invoke and cancel an activity
"""
"""
...
@@ -144,10 +178,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -144,10 +178,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Needed so that the message are removed from the queue
# Needed so that the message are removed from the queue
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
self
.
title2
,
organisation
.
getTitle
())
self
.
assertEqual
(
self
.
title2
,
organisation
.
getTitle
())
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
DeferredSetTitleActivity
(
self
,
activity
):
@
for_each_activity
def
testDeferredSetTitleActivity
(
self
,
activity
):
"""
"""
We check that the title is changed only after that
We check that the title is changed only after that
the activity was called
the activity was called
...
@@ -162,10 +195,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -162,10 +195,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
self
.
title1
,
organisation
.
getTitle
())
self
.
assertEqual
(
self
.
title1
,
organisation
.
getTitle
())
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertEqual
(
self
.
title2
,
organisation
.
getTitle
())
self
.
assertEqual
(
self
.
title2
,
organisation
.
getTitle
())
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
CallOnceWithActivity
(
self
,
activity
):
@
for_each_activity
def
testCallOnceWithActivity
(
self
,
activity
):
"""
"""
With this test we can check if methods are called
With this test we can check if methods are called
only once (sometimes it was twice !!!)
only once (sometimes it was twice !!!)
...
@@ -201,11 +233,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -201,11 +233,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
manageInvoke
(
organisation
.
getPhysicalPath
(),
'setFoobar'
)
activity_tool
.
manageInvoke
(
organisation
.
getPhysicalPath
(),
'setFoobar'
)
# Needed so that the message are commited into the queue
# Needed so that the message are commited into the queue
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
self
.
assertEqual
(
2
,
organisation
.
getFoobar
())
self
.
assertEqual
(
2
,
organisation
.
getFoobar
())
def
TryFlushActivity
(
self
,
activity
):
@
for_each_activity
def
testTryFlushActivity
(
self
,
activity
):
"""
"""
Check the method flush
Check the method flush
"""
"""
...
@@ -227,7 +258,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -227,7 +258,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title2
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title2
)
self
.
commit
()
self
.
commit
()
def
TryActivateInsideFlush
(
self
,
activity
):
@
for_each_activity
def
testTryActivateInsideFlush
(
self
,
activity
):
"""
"""
Create a new activity inside a flush action
Create a new activity inside a flush action
"""
"""
...
@@ -242,11 +274,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -242,11 +274,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
commit
()
self
.
commit
()
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title2
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title2
)
def
TryTwoMethods
(
self
,
activity
):
@
for_each_activity
def
testTryTwoMethods
(
self
,
activity
):
"""
"""
Try several activities
Try several activities
"""
"""
...
@@ -266,12 +297,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -266,12 +297,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
distribute
()
activity_tool
.
distribute
()
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
def
TryTwoMethodsAndFlushThem
(
self
,
activity
):
@
for_each_activity
def
testTryTwoMethodsAndFlushThem
(
self
,
activity
):
"""
"""
make sure flush works with several activities
make sure flush works with several activities
"""
"""
...
@@ -292,8 +322,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -292,8 +322,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
distribute
()
activity_tool
.
distribute
()
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
...
@@ -322,12 +350,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -322,12 +350,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
distribute
()
activity_tool
.
distribute
()
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getTitle
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
self
.
assertEqual
(
organisation
.
getDescription
(),
self
.
title1
)
def
TryMessageWithErrorOnActivity
(
self
,
activity
):
@
for_each_activity
def
testTryMessageWithErrorOnActivity
(
self
,
activity
):
"""
"""
Make sure that message with errors are not deleted
Make sure that message with errors are not deleted
"""
"""
...
@@ -350,10 +377,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -350,10 +377,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
manageCancel
(
organisation
.
getPhysicalPath
(),
'crashThisActivity'
)
activity_tool
.
manageCancel
(
organisation
.
getPhysicalPath
(),
'crashThisActivity'
)
# Needed so that the message are commited into the queue
# Needed so that the message are commited into the queue
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
DeferredSetTitleWithRenamedObject
(
self
,
activity
):
@
for_each_activity
def
testDeferredSetTitleWithRenamedObject
(
self
,
activity
):
"""
"""
make sure that it is impossible to rename an object
make sure that it is impossible to rename an object
if some activities are still waiting for this object
if some activities are still waiting for this object
...
@@ -386,8 +412,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -386,8 +412,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
result
=
active_process
.
getResultList
()[
0
]
result
=
active_process
.
getResultList
()[
0
]
self
.
assertEqual
(
result
.
method_id
,
'getTitle'
)
self
.
assertEqual
(
result
.
method_id
,
'getTitle'
)
self
.
assertEqual
(
result
.
result
,
self
.
title1
)
self
.
assertEqual
(
result
.
result
,
self
.
title1
)
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
TryActiveProcessWithResultDict
(
self
,
activity
):
def
TryActiveProcessWithResultDict
(
self
,
activity
):
"""
"""
...
@@ -417,11 +441,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -417,11 +441,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
result
=
result_dict
[
3
]
result
=
result_dict
[
3
]
self
.
assertEqual
(
result_dict
[
3
].
method_id
,
'getTitle'
)
self
.
assertEqual
(
result_dict
[
3
].
method_id
,
'getTitle'
)
self
.
assertEqual
(
result
.
result
,
self
.
title1
)
self
.
assertEqual
(
result
.
result
,
self
.
title1
)
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
@
for_each_activity
def
TryMethodAfterMethod
(
self
,
activity
):
def
test
TryMethodAfterMethod
(
self
,
activity
):
"""
"""
Ensure the order of an execution by a method id
Ensure the order of an execution by a method id
"""
"""
...
@@ -444,7 +466,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -444,7 +466,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
o
.
getTitle
(),
'acb'
)
self
.
assertEqual
(
o
.
getTitle
(),
'acb'
)
def
TryAfterTag
(
self
,
activity
):
@
for_each_activity
def
testTryAfterTag
(
self
,
activity
):
"""
"""
Ensure the order of an execution by a tag
Ensure the order of an execution by a tag
"""
"""
...
@@ -468,7 +491,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -468,7 +491,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
o
.
getCorporateName
(),
'cd'
)
self
.
assertEqual
(
o
.
getCorporateName
(),
'cd'
)
def
TryFlushActivityWithAfterTag
(
self
,
activity
):
@
for_each_activity
def
testTryFlushActivityWithAfterTag
(
self
,
activity
):
"""
"""
Ensure the order of an execution by a tag
Ensure the order of an execution by a tag
"""
"""
...
@@ -490,11 +514,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -490,11 +514,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
o
.
getDescription
(),
'?'
)
self
.
assertEqual
(
o
.
getDescription
(),
'?'
)
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
len
(
tool
.
getMessageList
()),
0
)
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
o
.
getDescription
(),
'b'
)
self
.
assertEqual
(
o
.
getDescription
(),
'b'
)
def
CheckScheduling
(
self
,
activity
):
@
for_each_activity
def
testScheduling
(
self
,
activity
):
"""
"""
Check if active objects with different after parameters are executed in a correct order
Check if active objects with different after parameters are executed in a correct order
"""
"""
...
@@ -516,7 +540,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -516,7 +540,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
o
.
getTitle
(),
'cb'
)
self
.
assertEqual
(
o
.
getTitle
(),
'cb'
)
def
CheckSchedulingAfterTagList
(
self
,
activity
):
@
for_each_activity
def
testSchedulingAfterTagList
(
self
,
activity
):
"""
"""
Check if active objects with different after parameters are executed in a
Check if active objects with different after parameters are executed in a
correct order, when after_tag is passed as a list
correct order, when after_tag is passed as a list
...
@@ -538,7 +563,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -538,7 +563,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
o
.
getTitle
(),
'last'
)
self
.
assertEqual
(
o
.
getTitle
(),
'last'
)
def
CheckCountMessageWithTag
(
self
,
activity
):
@
for_each_activity
def
testCheckCountMessageWithTag
(
self
,
activity
):
"""
"""
Check countMessageWithTag function.
Check countMessageWithTag function.
"""
"""
...
@@ -555,7 +581,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -555,7 +581,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
o
.
getTitle
(),
'a'
)
self
.
assertEqual
(
activity_tool
.
countMessageWithTag
(
'toto'
),
0
)
self
.
assertEqual
(
activity_tool
.
countMessageWithTag
(
'toto'
),
0
)
def
TryErrorsWhileFinishingCommitDB
(
self
,
activity
):
def
testTryErrorsWhileFinishingCommitDB
(
self
):
"""Try to execute active objects which may throw conflict errors
"""Try to execute active objects which may throw conflict errors
while validating, and check if they are still executed."""
while validating, and check if they are still executed."""
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
...
@@ -570,7 +596,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -570,7 +596,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Test some range of conflict error occurences.
# Test some range of conflict error occurences.
self
.
portal
.
organisation_module
.
reindexObject
()
self
.
portal
.
organisation_module
.
reindexObject
()
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
message
,
=
activity_tool
.
getMessageList
(
)
try
:
try
:
DB
.
original_query
=
DB
.
query
DB
.
original_query
=
DB
.
query
DB
.
query
=
query
DB
.
query
=
query
...
@@ -580,148 +606,43 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -580,148 +606,43 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
DB
.
query
=
DB
.
original_query
DB
.
query
=
DB
.
original_query
del
DB
.
original_query
del
DB
.
original_query
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
self
.
deleteMessageList
(
'SQLDict'
,
[
message
]
)
def
checkIsMessageRegisteredMethod
(
self
,
activity
):
@
for_each_activity
def
testIsMessageRegisteredMethod
(
self
,
activity
):
dedup
=
activity
!=
'SQLQueue'
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
object_b
=
self
.
getOrganisation
()
object_b
=
self
.
getOrganisation
()
object_a
=
object_b
.
getParentValue
()
object_a
=
object_b
.
getParentValue
()
# First case: creating the same activity twice must only register one.
def
check
(
count
):
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# Sanity check
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
count
)
self
.
tic
()
# First case: creating the same activity twice must only register one
# for queues with deduplication.
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getId
()
self
.
commit
()
check
(
1
if
dedup
else
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
# Second case: creating activity with same tag must only register one,
activity_tool
.
manageClearActivities
()
# for queues with deduplication.
self
.
commit
()
# Second case: creating activity with same tag must only register one.
# This behaviour is actually the same as the no-tag behaviour.
# This behaviour is actually the same as the no-tag behaviour.
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# Sanity check
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
self
.
commit
()
check
(
1
if
dedup
else
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
activity_tool
.
manageClearActivities
()
self
.
commit
()
# Third case: creating activities with different tags must register both.
# Third case: creating activities with different tags must register both.
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# Sanity check
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'foo'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'bar'
).
getId
()
object_a
.
activate
(
activity
=
activity
,
tag
=
'bar'
).
getId
()
self
.
commit
()
check
(
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
manageClearActivities
()
self
.
commit
()
# Fourth case: creating activities on different objects must register
# Fourth case: creating activities on different objects must register
# both.
# both.
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# Sanity check
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getId
()
object_b
.
activate
(
activity
=
activity
).
getId
()
object_b
.
activate
(
activity
=
activity
).
getId
()
self
.
commit
()
check
(
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
manageClearActivities
()
self
.
commit
()
# Fifth case: creating activities with different method must register
# Fifth case: creating activities with different method must register
# both.
# both.
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# Sanity check
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getId
()
object_a
.
activate
(
activity
=
activity
).
getTitle
()
object_a
.
activate
(
activity
=
activity
).
getTitle
()
self
.
commit
()
check
(
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
manageClearActivities
()
self
.
commit
()
def
test_01_DeferredSetTitleSQLDict
(
self
):
# Test if we can add a complete sales order
self
.
DeferredSetTitleActivity
(
'SQLDict'
)
def
test_02_DeferredSetTitleSQLQueue
(
self
):
# Test if we can add a complete sales order
self
.
DeferredSetTitleActivity
(
'SQLQueue'
)
def
test_03_DeferredSetTitleSQLJoblib
(
self
):
# Test if we can add a complete sales order
self
.
DeferredSetTitleActivity
(
'SQLJoblib'
)
def
test_05_InvokeAndCancelSQLDict
(
self
):
# Test if we can add a complete sales order
self
.
InvokeAndCancelActivity
(
'SQLDict'
)
def
test_06_InvokeAndCancelSQLQueue
(
self
):
# Test if we can add a complete sales order
self
.
InvokeAndCancelActivity
(
'SQLQueue'
)
def
test_07_InvokeAndCancelSQLJoblib
(
self
):
self
.
InvokeAndCancelActivity
(
'SQLJoblib'
)
def
test_09_CallOnceWithSQLDict
(
self
):
# Test if we call methods only once
self
.
CallOnceWithActivity
(
'SQLDict'
)
def
test_10_CallOnceWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
CallOnceWithActivity
(
'SQLQueue'
)
def
test_11_CallOnceWithSQLJoblib
(
self
):
self
.
CallOnceWithActivity
(
'SQLJoblib'
)
def
test_13_TryMessageWithErrorOnSQLDict
(
self
):
# Test if we call methods only once
self
.
TryMessageWithErrorOnActivity
(
'SQLDict'
)
def
test_14_TryMessageWithErrorOnSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryMessageWithErrorOnActivity
(
'SQLQueue'
)
def
test_15_TryMessageWithErrorOnSQLJoblib
(
self
):
self
.
TryMessageWithErrorOnActivity
(
'SQLJoblib'
)
def
test_17_TryFlushActivityWithSQLDict
(
self
):
# Test if we call methods only once
self
.
TryFlushActivity
(
'SQLDict'
)
def
test_18_TryFlushActivityWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryFlushActivity
(
'SQLQueue'
)
def
test_19_TryFlushActivityWithSQLJoblib
(
self
):
# Test if we call methods only once
self
.
TryFlushActivity
(
'SQLJoblib'
)
def
test_21_TryActivateInsideFlushWithSQLDict
(
self
):
# Test if we call methods only once
self
.
TryActivateInsideFlush
(
'SQLDict'
)
def
test_22_TryActivateInsideFlushWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryActivateInsideFlush
(
'SQLQueue'
)
def
test_23_TryActivateInsideFlushWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryActivateInsideFlush
(
'SQLJoblib'
)
def
test_25_TryTwoMethodsWithSQLDict
(
self
):
# Test if we call methods only once
self
.
TryTwoMethods
(
'SQLDict'
)
def
test_26_TryTwoMethodsWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryTwoMethods
(
'SQLQueue'
)
def
test_27_TryTwoMethodsWithSQLJoblib
(
self
):
# Test if we call methods only once
self
.
TryTwoMethods
(
'SQLJoblib'
)
def
test_29_TryTwoMethodsAndFlushThemWithSQLDict
(
self
):
# Test if we call methods only once
self
.
TryTwoMethodsAndFlushThem
(
'SQLDict'
)
def
test_30_TryTwoMethodsAndFlushThemWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
TryTwoMethodsAndFlushThem
(
'SQLQueue'
)
def
test_31_TryTwoMethodsAndFlushThemWithSQLJoblib
(
self
):
# Test if we call methods only once
self
.
TryTwoMethodsAndFlushThem
(
'SQLJoblib'
)
def
test_33_TryActivateFlushActivateTicWithSQLDict
(
self
):
def
test_33_TryActivateFlushActivateTicWithSQLDict
(
self
):
# Test if we call methods only once
# Test if we call methods only once
...
@@ -744,18 +665,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -744,18 +665,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Test if we call methods only once
# Test if we call methods only once
self
.
TryActivateFlushActivateTic
(
'SQLQueue'
,
commit_sub
=
1
)
self
.
TryActivateFlushActivateTic
(
'SQLQueue'
,
commit_sub
=
1
)
def
test_42_TryRenameObjectWithSQLDict
(
self
):
# Test if we call methods only once
self
.
DeferredSetTitleWithRenamedObject
(
'SQLDict'
)
def
test_43_TryRenameObjectWithSQLQueue
(
self
):
# Test if we call methods only once
self
.
DeferredSetTitleWithRenamedObject
(
'SQLQueue'
)
def
test_44_TryRenameObjectWithSQLJoblib
(
self
):
# Test if we call methods only once
self
.
DeferredSetTitleWithRenamedObject
(
'SQLJoblib'
)
def
test_46_TryActiveProcessWithSQLDict
(
self
):
def
test_46_TryActiveProcessWithSQLDict
(
self
):
# Test if we call methods only once
# Test if we call methods only once
self
.
TryActiveProcess
(
'SQLDict'
)
self
.
TryActiveProcess
(
'SQLDict'
)
...
@@ -768,18 +677,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -768,18 +677,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Test if we call methods only once
# Test if we call methods only once
self
.
TryActiveProcessWithResultDict
(
'SQLJoblib'
)
self
.
TryActiveProcessWithResultDict
(
'SQLJoblib'
)
def
test_54_TryAfterMethodIdWithSQLDict
(
self
):
# Test if after_method_id can be used
self
.
TryMethodAfterMethod
(
'SQLDict'
)
def
test_55_TryAfterMethodIdWithSQLQueue
(
self
):
# Test if after_method_id can be used
self
.
TryMethodAfterMethod
(
'SQLQueue'
)
def
test_56_TryAfterMethodIdWithSQLJoblib
(
self
):
# Test if after_method_id can be used
self
.
TryMethodAfterMethod
(
'SQLJoblib'
)
def
test_57_TryCallActivityWithRightUser
(
self
):
def
test_57_TryCallActivityWithRightUser
(
self
):
# Test if me execute methods with the right user
# Test if me execute methods with the right user
# This should be independant of the activity used
# This should be independant of the activity used
...
@@ -796,49 +693,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -796,49 +693,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Then execute activities as seb
# Then execute activities as seb
user
=
uf
.
getUserById
(
'seb'
).
__of__
(
uf
)
user
=
uf
.
getUserById
(
'seb'
).
__of__
(
uf
)
newSecurityManager
(
None
,
user
)
newSecurityManager
(
None
,
user
)
self
.
commit
()
self
.
tic
()
activity_tool
.
distribute
()
activity_tool
.
tic
()
email
=
organisation
.
get
(
'email'
)
email
=
organisation
.
get
(
'email'
)
# Check if what we did was executed as toto
# Check if what we did was executed as toto
self
.
assertEqual
(
email
.
getOwnerInfo
()[
'id'
],
'toto'
)
self
.
assertEqual
(
email
.
getOwnerInfo
()[
'id'
],
'toto'
)
def
test_59_TryAfterTagWithSQLDict
(
self
):
# Test if after_tag can be used
self
.
TryAfterTag
(
'SQLDict'
)
def
test_60_TryAfterTagWithSQLQueue
(
self
):
# Test if after_tag can be used
self
.
TryAfterTag
(
'SQLQueue'
)
def
test_61_TryAfterTagWithSQLJoblib
(
self
):
# Test if after_tag can be used
self
.
TryAfterTag
(
'SQLJoblib'
)
def
test_62_CheckSchedulingWithSQLDict
(
self
):
# Test if scheduling is correct with SQLDict
self
.
CheckScheduling
(
'SQLDict'
)
def
test_63_CheckSchedulingWithSQLQueue
(
self
):
# Test if scheduling is correct with SQLQueue
self
.
CheckScheduling
(
'SQLQueue'
)
def
test_64_CheckSchedulingWithSQLJoblib
(
self
):
# Test if scheduling is correct with SQLQueue
self
.
CheckScheduling
(
'SQLJoblib'
)
def
test_65_CheckSchedulingAfterTagListWithSQLDict
(
self
):
# Test if scheduling is correct with SQLDict
self
.
CheckSchedulingAfterTagList
(
'SQLDict'
)
def
test_66_CheckSchedulingWithAfterTagListSQLQueue
(
self
):
# Test if scheduling is correct with SQLQueue
self
.
CheckSchedulingAfterTagList
(
'SQLQueue'
)
def
test_67_CheckSchedulingWithAfterTagListSQLJoblib
(
self
):
# Test if scheduling is correct with SQLQueue
self
.
CheckSchedulingAfterTagList
(
'SQLJoblib'
)
def
flushAllActivities
(
self
,
silent
=
0
,
loop_size
=
1000
):
def
flushAllActivities
(
self
,
silent
=
0
,
loop_size
=
1000
):
"""Executes all messages until the queue only contains failed
"""Executes all messages until the queue only contains failed
messages.
messages.
...
@@ -848,10 +707,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -848,10 +707,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
distribute
(
node_count
=
1
)
activity_tool
.
distribute
(
node_count
=
1
)
activity_tool
.
tic
(
processing_node
=
1
)
activity_tool
.
tic
(
processing_node
=
1
)
finished
=
1
finished
=
all
(
message
.
processing_node
==
INVOKE_ERROR_STATE
for
message
in
activity_tool
.
getMessageList
():
for
message
in
activity_tool
.
getMessageList
())
if
message
.
processing_node
!=
INVOKE_ERROR_STATE
:
finished
=
0
activity_tool
.
timeShift
(
3
*
VALIDATION_ERROR_DELAY
)
activity_tool
.
timeShift
(
3
*
VALIDATION_ERROR_DELAY
)
self
.
commit
()
self
.
commit
()
...
@@ -881,15 +738,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -881,15 +738,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
raise
ValueError
(
'This method always fail'
)
raise
ValueError
(
'This method always fail'
)
Organisation
.
failingMethod
=
failingMethod
Organisation
.
failingMethod
=
failingMethod
activity_list
=
[
'SQLQueue'
,
'SQLDict'
,
'SQLJoblib'
]
for
activity
in
ActivityTool
.
activity_dict
:
for
activity
in
activity_list
:
# reset
# reset
activity_tool
.
manageClearActivities
()
activity_tool
.
manageClearActivities
()
obj
.
setTitle
(
original_title
)
obj
.
setTitle
(
original_title
)
self
.
commit
()
self
.
commit
()
# activate failing message and flush
# activate failing message and flush
for
fail_activity
in
activity_lis
t
:
for
fail_activity
in
ActivityTool
.
activity_dic
t
:
obj
.
activate
(
activity
=
fail_activity
).
failingMethod
()
obj
.
activate
(
activity
=
fail_activity
).
failingMethod
()
self
.
commit
()
self
.
commit
()
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
...
@@ -910,19 +766,16 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -910,19 +766,16 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
full_message_list
=
activity_tool
.
getMessageList
()
full_message_list
=
activity_tool
.
getMessageList
()
remaining_messages
=
[
a
for
a
in
full_message_list
if
a
.
method_id
!=
remaining_messages
=
[
a
for
a
in
full_message_list
if
a
.
method_id
!=
'failingMethod'
]
'failingMethod'
]
if
len
(
full_message_list
)
!=
4
:
self
.
assertEqual
(
len
(
full_message_list
),
4
,
self
.
fail
(
'failingMethod should not have been flushed'
)
'failingMethod should not have been flushed'
)
if
len
(
remaining_messages
)
!=
1
:
self
.
assertEqual
(
len
(
remaining_messages
),
1
,
self
.
fail
(
'Activity tool should have one blocked setTitle activity'
)
'Activity tool should have one blocked setTitle activity'
)
self
.
assertEqual
(
remaining_messages
[
0
].
activity_kw
[
'after_method_id'
],
self
.
assertEqual
(
remaining_messages
[
0
].
activity_kw
[
'after_method_id'
],
[
'failingMethod'
])
[
'failingMethod'
])
self
.
assertEqual
(
obj
.
getTitle
(),
original_title
)
self
.
assertEqual
(
obj
.
getTitle
(),
original_title
)
def
test_69_TestCountMessageWithTagWithSQLDict
(
self
):
activity_tool
.
manageClearActivities
()
"""
self
.
commit
()
Test new countMessageWithTag function with SQLDict.
"""
self
.
CheckCountMessageWithTag
(
'SQLDict'
)
def
test_70_TestCancelFailedActiveObject
(
self
):
def
test_70_TestCancelFailedActiveObject
(
self
):
"""Cancel an active object to make sure that it does not refer to
"""Cancel an active object to make sure that it does not refer to
...
@@ -965,11 +818,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -965,11 +818,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
message
=
activity_tool
.
getMessageList
()[
0
]
message
=
activity_tool
.
getMessageList
()[
0
]
activity_tool
.
manageCancel
(
message
.
object_path
,
message
.
method_id
)
activity_tool
.
manageCancel
(
message
.
object_path
,
message
.
method_id
)
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_71_RetryMessageExecution
(
self
):
def
test_71_RetryMessageExecution
(
self
):
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
self
.
assertFalse
(
activity_tool
.
getMessageList
())
exec_count
=
[
0
]
exec_count
=
[
0
]
# priority does not matter anymore
# priority does not matter anymore
priority
=
random
.
Random
().
randint
priority
=
random
.
Random
().
randint
...
@@ -983,7 +834,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -983,7 +834,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
raise
ConflictError
if
conflict
else
Exception
raise
ConflictError
if
conflict
else
Exception
def
check
(
retry_list
,
**
activate_kw
):
def
check
(
retry_list
,
**
activate_kw
):
fail
=
retry_list
[
-
1
][
0
]
is
not
None
and
1
or
0
fail
=
retry_list
[
-
1
][
0
]
is
not
None
and
1
or
0
for
activity
in
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
:
for
activity
in
ActivityTool
.
activity_dict
:
exec_count
[
0
]
=
0
exec_count
[
0
]
=
0
activity_tool
.
activate
(
activity
=
activity
,
priority
=
priority
(
1
,
6
),
activity_tool
.
activate
(
activity
=
activity
,
priority
=
priority
(
1
,
6
),
**
activate_kw
).
doSomething
(
retry_list
)
**
activate_kw
).
doSomething
(
retry_list
)
...
@@ -1023,36 +874,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1023,36 +874,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
del
activity_tool
.
__class__
.
doSomething
del
activity_tool
.
__class__
.
doSomething
self
.
assertFalse
(
activity_tool
.
getMessageList
())
def
test_75_TestErrorsWhileFinishingCommitDBWithSQLDict
(
self
):
"""
"""
self
.
TryErrorsWhileFinishingCommitDB
(
'SQLDict'
)
def
test_76_TestErrorsWhileFinishingCommitDBWithSQLQueue
(
self
):
"""
"""
self
.
TryErrorsWhileFinishingCommitDB
(
'SQLQueue'
)
def
test_77_TryFlushActivityWithAfterTagSQLDict
(
self
):
# Test if after_tag can be used
self
.
TryFlushActivityWithAfterTag
(
'SQLDict'
)
def
test_78_TryFlushActivityWithAfterTagWithSQLQueue
(
self
):
# Test if after_tag can be used
self
.
TryFlushActivityWithAfterTag
(
'SQLQueue'
)
def
test_79_ActivateKwForNewContent
(
self
):
def
test_79_ActivateKwForNewContent
(
self
):
o1
=
self
.
getOrganisationModule
().
newContent
(
o1
=
self
.
getOrganisationModule
().
newContent
(
activate_kw
=
dict
(
tag
=
'The Tag'
))
activate_kw
=
dict
(
tag
=
'The Tag'
))
self
.
commit
()
self
.
commit
()
messages_for_o1
=
[
m
for
m
in
self
.
getActivityTool
().
getMessageList
()
m
,
=
self
.
getActivityTool
().
getMessageList
(
path
=
o1
.
getPath
())
if
m
.
object_path
==
o1
.
getPhysicalPath
()]
self
.
assertNotEquals
(
0
,
len
(
messages_for_o1
))
for
m
in
messages_for_o1
:
self
.
assertEqual
(
m
.
activity_kw
.
get
(
'tag'
),
'The Tag'
)
self
.
assertEqual
(
m
.
activity_kw
.
get
(
'tag'
),
'The Tag'
)
self
.
tic
()
def
test_80_FlushAfterMultipleActivate
(
self
):
def
test_80_FlushAfterMultipleActivate
(
self
):
orga_module
=
self
.
getOrganisationModule
()
orga_module
=
self
.
getOrganisationModule
()
...
@@ -1066,7 +895,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1066,7 +895,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
setDescription
(
d
+
'a'
)
self
.
setDescription
(
d
+
'a'
)
Organisation
.
updateDesc
=
updateDesc
Organisation
.
updateDesc
=
updateDesc
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
# First check dequeue read same message only once
# First check dequeue read same message only once
for
i
in
xrange
(
10
):
for
i
in
xrange
(
10
):
p
.
activate
(
activity
=
"SQLDict"
).
updateDesc
()
p
.
activate
(
activity
=
"SQLDict"
).
updateDesc
()
...
@@ -1084,13 +912,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1084,13 +912,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
10
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
10
)
activity_tool
.
flush
(
p
,
invoke
=
0
)
activity_tool
.
flush
(
p
,
invoke
=
0
)
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_81_IsMessageRegisteredSQLDict
(
self
):
"""
This test tests behaviour of IsMessageRegistered method.
"""
self
.
checkIsMessageRegisteredMethod
(
'SQLDict'
)
def
test_82_AbortTransactionSynchronously
(
self
):
def
test_82_AbortTransactionSynchronously
(
self
):
"""
"""
...
@@ -1102,7 +923,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1102,7 +923,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
module
=
self
.
getOrganisationModule
()
module
=
self
.
getOrganisationModule
()
organisation
=
module
.
newContent
(
portal_type
=
'Organisation'
)
organisation
=
module
.
newContent
(
portal_type
=
'Organisation'
)
organisation_id
=
organisation
.
getId
()
organisation_id
=
organisation
.
getId
()
self
.
commit
()
self
.
tic
()
organisation
=
module
[
organisation_id
]
organisation
=
module
[
organisation_id
]
# Now fake a read conflict.
# Now fake a read conflict.
...
@@ -1124,8 +945,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1124,8 +945,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
abort
()
self
.
abort
()
organisation
.
uid
organisation
.
uid
@
for_each_activity
def
callWithGroupIdParamater
(
self
,
activity
):
def
testCallWithGroupIdParamater
(
self
,
activity
):
dedup
=
activity
!=
'SQLQueue'
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
organisation
=
self
.
getOrganisation
()
organisation
=
self
.
getOrganisation
()
# Defined a group method
# Defined a group method
...
@@ -1152,7 +974,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1152,7 +974,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
message_list
=
activity_tool
.
getMessageList
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
5
)
self
.
assertEqual
(
len
(
message_list
),
5
)
activity_tool
.
tic
()
activity_tool
.
tic
()
expected
=
dict
(
SQLDict
=
1
,
SQLQueue
=
5
,
SQLJoblib
=
1
)[
activity
]
expected
=
1
if
dedup
else
5
self
.
assertEqual
(
expected
,
organisation
.
getFoobar
())
self
.
assertEqual
(
expected
,
organisation
.
getFoobar
())
...
@@ -1183,30 +1005,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1183,30 +1005,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
message_list
=
activity_tool
.
getMessageList
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
20
)
self
.
assertEqual
(
len
(
message_list
),
20
)
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertEqual
(
dict
(
SQLDict
=
11
,
SQLQueue
=
60
,
SQLJoblib
=
11
)[
activity
]
,
self
.
assertEqual
(
11
if
dedup
else
60
,
organisation
.
getFoobar
())
organisation
.
getFoobar
())
self
.
assertEqual
(
dict
(
SQLDict
=
[
1
,
1
,
1
],
SQLQueue
=
[
5
,
5
,
10
],
SQLJoblib
=
[
1
,
1
,
1
])[
activity
],
self
.
assertEqual
(
[
1
,
1
,
1
]
if
dedup
else
[
5
,
5
,
10
],
sorted
(
foobar_list
))
sorted
(
foobar_list
))
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
test_83a_CallWithGroupIdParamaterSQLDict
(
self
):
"""
Test that group_id parameter is used to separate execution of the same method
"""
self
.
callWithGroupIdParamater
(
'SQLDict'
)
def
test_83b_CallWithGroupIdParamaterSQLQueue
(
self
):
"""
Test that group_id parameter is used to separate execution of the same method
"""
self
.
callWithGroupIdParamater
(
'SQLQueue'
)
def
test_83c_CallWithGroupIdParamaterSQLJoblib
(
self
):
"""
Test that group_id parameter is used to separate execution of the same method
"""
self
.
callWithGroupIdParamater
(
'SQLJoblib'
)
def
test_84_ActivateKwForWorkflowTransition
(
self
):
def
test_84_ActivateKwForWorkflowTransition
(
self
):
"""
"""
...
@@ -1216,19 +1018,15 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1216,19 +1018,15 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
tic
()
self
.
tic
()
o1
.
validate
(
activate_kw
=
dict
(
tag
=
'The Tag'
))
o1
.
validate
(
activate_kw
=
dict
(
tag
=
'The Tag'
))
self
.
commit
()
self
.
commit
()
messages_for_o1
=
[
m
for
m
in
self
.
getActivityTool
().
getMessageList
()
m
,
=
self
.
getActivityTool
().
getMessageList
(
path
=
o1
.
getPath
())
if
m
.
object_path
==
o1
.
getPhysicalPath
()]
self
.
assertNotEquals
(
0
,
len
(
messages_for_o1
))
for
m
in
messages_for_o1
:
self
.
assertEqual
(
m
.
activity_kw
.
get
(
'tag'
),
'The Tag'
)
self
.
assertEqual
(
m
.
activity_kw
.
get
(
'tag'
),
'The Tag'
)
self
.
tic
()
def
test_85_LossOfVolatileAttribute
(
self
):
def
test_85_LossOfVolatileAttribute
(
self
):
"""
"""
Test that the loss of volatile attribute doesn't loose activities
Test that the loss of volatile attribute doesn't loose activities
"""
"""
activity_tool
=
self
.
getActivityTool
()
activity_tool
=
self
.
getActivityTool
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
0
)
def
delete_volatiles
():
def
delete_volatiles
():
for
property_id
in
activity_tool
.
__dict__
.
keys
():
for
property_id
in
activity_tool
.
__dict__
.
keys
():
if
property_id
.
startswith
(
'_v_'
):
if
property_id
.
startswith
(
'_v_'
):
...
@@ -1245,6 +1043,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1245,6 +1043,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
commit
()
self
.
commit
()
message_list
=
activity_tool
.
getMessageList
()
message_list
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
message_list
),
2
)
self
.
assertEqual
(
len
(
message_list
),
2
)
self
.
tic
()
def
test_88_ProcessingMultipleMessagesMustRevertIndividualMessagesOnError
(
self
):
def
test_88_ProcessingMultipleMessagesMustRevertIndividualMessagesOnError
(
self
):
"""
"""
...
@@ -1273,8 +1072,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1273,8 +1072,9 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
obj
.
getTitle
(),
'a'
)
self
.
assertEqual
(
obj
.
getTitle
(),
'a'
)
self
.
assertEqual
(
activity_tool
.
countMessage
(
method_id
=
'appendToTitle'
),
3
)
self
.
assertEqual
(
activity_tool
.
countMessage
(
method_id
=
'appendToTitle'
),
3
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
assertEqual
(
activity_tool
.
countMessage
(
method_id
=
'appendToTitle'
),
1
)
self
.
assertEqual
(
sorted
(
obj
.
getTitle
()),
[
'a'
,
'b'
,
'd'
])
self
.
assertEqual
(
sorted
(
obj
.
getTitle
()),
[
'a'
,
'b'
,
'd'
])
message
,
=
self
.
getMessageList
(
'SQLQueue'
,
method_id
=
'appendToTitle'
)
self
.
deleteMessageList
(
'SQLQueue'
,
[
message
])
finally
:
finally
:
del
Organisation
.
appendToTitle
del
Organisation
.
appendToTitle
...
@@ -1306,7 +1106,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1306,7 +1106,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
del
Organisation
.
putMarkerValue
del
Organisation
.
putMarkerValue
del
Organisation
.
checkMarkerValue
del
Organisation
.
checkMarkerValue
def
TryUserNotificationOnActivityFailure
(
self
,
activity
):
@
for_each_activity
def
testTryUserNotificationOnActivityFailure
(
self
,
activity
):
message_list
=
self
.
portal
.
MailHost
.
_message_list
message_list
=
self
.
portal
.
MailHost
.
_message_list
del
message_list
[:]
del
message_list
[:]
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
...
@@ -1335,26 +1136,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1335,26 +1136,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
del
Organisation
.
failingMethod
del
Organisation
.
failingMethod
def
test_90_userNotificationOnActivityFailureWithSQLDict
(
self
):
"""
Check that a user notification method is called on message when activity
fails and will not be tried again.
"""
self
.
TryUserNotificationOnActivityFailure
(
'SQLDict'
)
def
test_91_userNotificationOnActivityFailureWithSQLJoblib
(
self
):
"""
Check user notification sent on activity final error
"""
self
.
TryUserNotificationOnActivityFailure
(
'SQLJoblib'
)
def
test_92_userNotificationOnActivityFailureWithSQLQueue
(
self
):
"""
Check that a user notification method is called on message when activity
fails and will not be tried again.
"""
self
.
TryUserNotificationOnActivityFailure
(
'SQLQueue'
)
def
test_93_tryUserNotificationRaise
(
self
):
def
test_93_tryUserNotificationRaise
(
self
):
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
...
@@ -1379,13 +1160,13 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1379,13 +1160,13 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
Message
.
notifyUser
=
original_notifyUser
Message
.
notifyUser
=
original_notifyUser
del
Organisation
.
failingMethod
del
Organisation
.
failingMethod
def
TryActivityRaiseInCommitDoesNotStallActivityConection
(
self
,
activity
):
@
for_each_activity
def
testTryActivityRaiseInCommitDoesNotStallActivityConection
(
self
,
activity
):
"""
"""
Check that an activity which commit raises (as would a regular conflict
Check that an activity which commit raises (as would a regular conflict
error be raised in tpc_vote) does not cause activity connection to
error be raised in tpc_vote) does not cause activity connection to
stall.
stall.
"""
"""
activity_tool
=
self
.
getActivityTool
()
try
:
try
:
Organisation
.
registerFailingTransactionManager
=
registerFailingTransactionManager
Organisation
.
registerFailingTransactionManager
=
registerFailingTransactionManager
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
...
@@ -1402,19 +1183,15 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1402,19 +1183,15 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertTrue
(
connection_da
.
_registered
)
self
.
assertTrue
(
connection_da
.
_registered
)
self
.
commit
()
self
.
commit
()
self
.
assertFalse
(
connection_da
.
_registered
)
self
.
assertFalse
(
connection_da
.
_registered
)
message
,
=
self
.
getMessageList
(
activity
)
self
.
deleteMessageList
(
activity
,
[
message
])
finally
:
finally
:
del
Organisation
.
registerFailingTransactionManager
del
Organisation
.
registerFailingTransactionManager
def
test_96_ActivityRaiseInCommitDoesNotStallActivityConectionSQLDict
(
self
):
@
for_each_activity
self
.
TryActivityRaiseInCommitDoesNotStallActivityConection
(
'SQLDict'
)
def
testTryActivityRaiseInCommitDoesNotLoseMessages
(
self
,
activity
):
def
test_97_ActivityRaiseInCommitDoesNotStallActivityConectionSQLQueue
(
self
):
self
.
TryActivityRaiseInCommitDoesNotStallActivityConection
(
'SQLQueue'
)
def
TryActivityRaiseInCommitDoesNotLooseMessages
(
self
,
activity
):
"""
"""
"""
"""
activity_tool
=
self
.
getActivityTool
()
try
:
try
:
Organisation
.
registerFailingTransactionManager
=
registerFailingTransactionManager
Organisation
.
registerFailingTransactionManager
=
registerFailingTransactionManager
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
...
@@ -1424,17 +1201,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1424,17 +1201,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
commit
()
self
.
commit
()
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
activity_tool
.
countMessage
(
method_id
=
'registerFailingTransactionManager'
),
1
)
message
,
=
self
.
getMessageList
(
activity
,
method_id
=
'registerFailingTransactionManager'
)
self
.
deleteMessageList
(
activity
,
[
message
])
finally
:
finally
:
del
Organisation
.
registerFailingTransactionManager
del
Organisation
.
registerFailingTransactionManager
def
test_98_ActivityRaiseInCommitDoesNotLooseMessagesSQLDict
(
self
):
@
for_each_activity
self
.
TryActivityRaiseInCommitDoesNotLooseMessages
(
'SQLDict'
)
def
testTryChangeSkinInActivity
(
self
,
activity
):
def
test_99_ActivityRaiseInCommitDoesNotLooseMessagesSQLQueue
(
self
):
self
.
TryActivityRaiseInCommitDoesNotLooseMessages
(
'SQLQueue'
)
def
TryChangeSkinInActivity
(
self
,
activity
):
activity_tool
=
self
.
getActivityTool
()
activity_tool
=
self
.
getActivityTool
()
def
changeSkinToNone
(
self
):
def
changeSkinToNone
(
self
):
self
.
getPortalObject
().
changeSkin
(
None
)
self
.
getPortalObject
().
changeSkin
(
None
)
...
@@ -1446,24 +1220,18 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1446,24 +1220,18 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
finally
:
finally
:
del
Organisation
.
changeSkinToNone
del
Organisation
.
changeSkinToNone
def
test_100_TryChangeSkinInActivitySQLDict
(
self
):
@
for_each_activity
self
.
TryChangeSkinInActivity
(
'SQLDict'
)
def
testDeduplicatingQueuesDoNotDeleteSimilaritiesBeforeExecution
(
self
,
activity
):
def
test_101_TryChangeSkinInActivitySQLQueue
(
self
):
self
.
TryChangeSkinInActivity
(
'SQLQueue'
)
def
test_102_TryChangeSkinInActivitySQLJoblib
(
self
):
self
.
TryChangeSkinInActivity
(
'SQLJoblib'
)
def
test_103_1_CheckSQLDictDoesNotDeleteSimilaritiesBeforeExecution
(
self
):
"""
"""
Test that SQLDict does not delete similar messages which have the same
Test that SQLDict does not delete similar messages which have the same
method_id and path but a different tag before execution.
method_id and path but a different tag before execution.
"""
"""
if
activity
==
'SQLQueue'
:
return
activity_tool
=
self
.
getActivityTool
()
activity_tool
=
self
.
getActivityTool
()
marker
=
[]
marker
=
[]
def
doSomething
(
self
,
other_tag
):
def
doSomething
(
self
,
other_tag
):
...
@@ -1471,22 +1239,23 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1471,22 +1239,23 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
.
__class__
.
doSomething
=
doSomething
activity_tool
.
__class__
.
doSomething
=
doSomething
try
:
try
:
# Adds two similar but not the same activities.
# Adds two similar but not the same activities.
activity_tool
.
activate
(
activity
=
'SQLDict'
,
after_tag
=
'foo'
,
activity_tool
.
activate
(
activity
=
activity
,
after_tag
=
'foo'
,
tag
=
'a'
).
doSomething
(
other_tag
=
'b'
)
tag
=
'a'
).
doSomething
(
other_tag
=
'b'
)
activity_tool
.
activate
(
activity
=
'SQLDict'
,
after_tag
=
'bar'
,
activity_tool
.
activate
(
activity
=
activity
,
after_tag
=
'bar'
,
tag
=
'b'
).
doSomething
(
other_tag
=
'a'
)
tag
=
'b'
).
doSomething
(
other_tag
=
'a'
)
self
.
commit
()
self
.
commit
()
activity_tool
.
tic
()
# make sure distribution phase was not skipped
activity_tool
.
tic
()
# make sure distribution phase was not skipped
activity_tool
.
distribute
()
activity_tool
.
distribute
()
# after distribute, similarities are still there.
# after distribute, similarities are still there.
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
(
)),
2
)
self
.
assertEqual
(
len
(
self
.
getMessageList
(
activity
)),
2
)
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
self
.
assertEqual
(
marker
,
[
1
])
self
.
assertEqual
(
marker
,
[
1
])
finally
:
finally
:
del
activity_tool
.
__class__
.
doSomething
del
activity_tool
.
__class__
.
doSomething
def
test_103_2_CheckSQLDictDoesNotDeleteDuplicatesBeforeExecution
(
self
):
@
for_each_activity
def
testDeduplicatingQueuesDoNotDeleteDuplicatesBeforeExecution
(
self
,
activity
):
"""
"""
Test that SQLDict does not delete messages before execution
Test that SQLDict does not delete messages before execution
even if messages have the same method_id and path and tag.
even if messages have the same method_id and path and tag.
...
@@ -1500,46 +1269,26 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1500,46 +1269,26 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
- inside the CMFActivity-level processing surrounding activity execution
- inside the CMFActivity-level processing surrounding activity execution
because it has to load the activities to process them anyway
because it has to load the activities to process them anyway
"""
"""
if
activity
==
'SQLQueue'
:
return
activity_tool
=
self
.
getActivityTool
()
activity_tool
=
self
.
getActivityTool
()
# Adds two same activities.
# Adds two same activities.
activity_tool
.
activate
(
activity
=
'SQLDict'
,
after_tag
=
'foo'
,
priority
=
2
,
activity_tool
.
activate
(
activity
=
activity
,
after_tag
=
'foo'
,
priority
=
2
,
tag
=
'a'
).
getId
()
self
.
commit
()
uid1
,
=
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
()]
activity_tool
.
activate
(
activity
=
'SQLDict'
,
after_tag
=
'bar'
,
priority
=
1
,
tag
=
'a'
).
getId
()
self
.
commit
()
uid2
,
=
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
()
if
x
.
uid
!=
uid1
]
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
distribute
()
# After distribute, duplicate is still present.
self
.
assertItemsEqual
([
uid1
,
uid2
],
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
()])
activity_tool
.
tic
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_103_3_CheckSQLJoblibDoesNotDeleteDuplicatesBeforeExecution
(
self
):
"""
(see test_103_2_CheckSQLDictDoesNotDeleteDuplicatesBeforeExecution)
"""
activity_tool
=
self
.
getActivityTool
()
# Adds two same activities.
activity_tool
.
activate
(
activity
=
'SQLJoblib'
,
after_tag
=
'foo'
,
priority
=
2
,
tag
=
'a'
).
getId
()
tag
=
'a'
).
getId
()
self
.
commit
()
self
.
commit
()
uid1
,
=
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
(
)]
uid1
,
=
[
x
.
uid
for
x
in
self
.
getMessageList
(
activity
)]
activity_tool
.
activate
(
activity
=
'SQLJoblib'
,
after_tag
=
'bar'
,
priority
=
1
,
activity_tool
.
activate
(
activity
=
activity
,
after_tag
=
'bar'
,
priority
=
1
,
tag
=
'a'
).
getId
()
tag
=
'a'
).
getId
()
self
.
commit
()
self
.
commit
()
uid2
,
=
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
(
)
if
x
.
uid
!=
uid1
]
uid2
,
=
[
x
.
uid
for
x
in
self
.
getMessageList
(
activity
)
if
x
.
uid
!=
uid1
]
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
distribute
()
activity_tool
.
distribute
()
# After distribute, duplicate is still present.
# After distribute, duplicate is still present.
self
.
assertItemsEqual
([
uid1
,
uid2
],
[
x
.
uid
for
x
in
activity_tool
.
getMessageList
()])
self
.
assertItemsEqual
([
uid1
,
uid2
],
[
x
.
uid
for
x
in
self
.
getMessageList
(
activity
)])
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_103_4_CheckSQLDictDistributeWithSerializationTagAndGroupMethodId
(
def
testCheckSQLDictDistributeWithSerializationTagAndGroupMethodId
(
self
):
self
):
"""
"""
Distribuation was at some point buggy with this scenario when there was
Distribuation was at some point buggy with this scenario when there was
activate with the same serialization_tag and one time with a group_method
activate with the same serialization_tag and one time with a group_method
...
@@ -1560,7 +1309,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1560,7 +1309,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# After distribute, there is no deletion because it is different method
# After distribute, there is no deletion because it is different method
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_104_interQueuePriorities
(
self
):
def
test_104_interQueuePriorities
(
self
):
"""
"""
...
@@ -1609,7 +1357,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1609,7 +1357,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
del
Organisation
.
mustRunBefore
del
Organisation
.
mustRunBefore
del
Organisation
.
mustRunAfter
del
Organisation
.
mustRunAfter
def
CheckActivityRuntimeEnvironment
(
self
,
activity
):
@
for_each_activity
def
testCheckActivityRuntimeEnvironment
(
self
,
activity
):
document
=
self
.
portal
.
organisation_module
document
=
self
.
portal
.
organisation_module
activity_result
=
[]
activity_result
=
[]
def
extractActivityRuntimeEnvironment
(
self
):
def
extractActivityRuntimeEnvironment
(
self
):
...
@@ -1637,21 +1386,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1637,21 +1386,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
del
document
.
__class__
.
doSomething
del
document
.
__class__
.
doSomething
def
test_105_activityRuntimeEnvironmentSQLDict
(
self
):
@
for_each_activity
self
.
CheckActivityRuntimeEnvironment
(
'SQLDict'
)
def
testSerializationTag
(
self
,
activity
):
def
test_106_activityRuntimeEnvironmentSQLQueue
(
self
):
self
.
CheckActivityRuntimeEnvironment
(
'SQLQueue'
)
def
test_107_activityRuntimeEnvironmentSQLJoblib
(
self
):
self
.
CheckActivityRuntimeEnvironment
(
'SQLJoblib'
)
def
CheckSerializationTag
(
self
,
activity
):
organisation
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
organisation
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
self
.
tic
()
self
.
tic
()
activity_tool
=
self
.
getActivityTool
()
activity_tool
=
self
.
getActivityTool
()
result
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
result
),
0
)
# First scenario: activate, distribute, activate, distribute
# First scenario: activate, distribute, activate, distribute
# Create first activity and distribute: it must be distributed
# Create first activity and distribute: it must be distributed
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
'1'
).
getTitle
()
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
'1'
).
getTitle
()
...
@@ -1670,8 +1409,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1670,8 +1409,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
result
=
activity_tool
.
getMessageList
()
result
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
([
x
for
x
in
result
if
x
.
processing_node
==
0
]),
1
)
# Distributed message list len is still 1
self
.
assertEqual
(
len
([
x
for
x
in
result
if
x
.
processing_node
==
0
]),
1
)
# Distributed message list len is still 1
self
.
tic
()
self
.
tic
()
result
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
result
),
0
)
# Second scenario: activate, activate, distribute
# Second scenario: activate, activate, distribute
# Both messages must be distributed (this is different from regular tags)
# Both messages must be distributed (this is different from regular tags)
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
'1'
,
priority
=
2
).
getTitle
()
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
'1'
,
priority
=
2
).
getTitle
()
...
@@ -1689,19 +1426,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1689,19 +1426,10 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
message
,
=
[
x
for
x
in
result
if
x
.
processing_node
==
-
1
]
message
,
=
[
x
for
x
in
result
if
x
.
processing_node
==
-
1
]
self
.
assertEqual
(
message
.
method_id
,
'getTitle'
)
self
.
assertEqual
(
message
.
method_id
,
'getTitle'
)
self
.
tic
()
self
.
tic
()
result
=
activity_tool
.
getMessageList
()
self
.
assertEqual
(
len
(
result
),
0
)
# Check that giving a None value to serialization_tag does not confuse
# Check that giving a None value to serialization_tag does not confuse
# CMFActivity
# CMFActivity
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
None
).
getTitle
()
organisation
.
activate
(
activity
=
activity
,
serialization_tag
=
None
).
getTitle
()
self
.
tic
()
self
.
tic
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
def
test_108_checkSerializationTagSQLDict
(
self
):
self
.
CheckSerializationTag
(
'SQLDict'
)
def
test_109_checkSerializationTagSQLQueue
(
self
):
self
.
CheckSerializationTag
(
'SQLQueue'
)
def
test_110_testAbsoluteUrl
(
self
):
def
test_110_testAbsoluteUrl
(
self
):
# Tests that absolute_url works in activities. The URL generation is based
# Tests that absolute_url works in activities. The URL generation is based
...
@@ -1814,7 +1542,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1814,7 +1542,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# Forcibly restore skin selection, otherwise getMessageList would only
# Forcibly restore skin selection, otherwise getMessageList would only
# emit a log when retrieving the ZSQLMethod.
# emit a log when retrieving the ZSQLMethod.
portal
.
changeSkin
(
None
)
portal
.
changeSkin
(
None
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
0
)
finally
:
finally
:
del
Organisation
.
firstTest
del
Organisation
.
firstTest
del
Organisation
.
secondTest
del
Organisation
.
secondTest
...
@@ -1921,6 +1648,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1921,6 +1648,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
del
Organisation
.
waitingActivity
del
Organisation
.
waitingActivity
SQLDict
.
dequeueMessage
=
original_dequeue
SQLDict
.
dequeueMessage
=
original_dequeue
self
.
tic
()
def
test_hasActivity
(
self
):
def
test_hasActivity
(
self
):
active_object
=
self
.
portal
.
organisation_module
.
newContent
(
active_object
=
self
.
portal
.
organisation_module
.
newContent
(
...
@@ -1932,7 +1660,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1932,7 +1660,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertFalse
(
active_process
.
hasActivity
())
self
.
assertFalse
(
active_process
.
hasActivity
())
def
test
(
obj
,
**
kw
):
def
test
(
obj
,
**
kw
):
for
activity
in
(
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
)
:
for
activity
in
ActivityTool
.
activity_dict
:
active_object
.
activate
(
activity
=
activity
,
**
kw
).
getTitle
()
active_object
.
activate
(
activity
=
activity
,
**
kw
).
getTitle
()
self
.
commit
()
self
.
commit
()
self
.
assertTrue
(
obj
.
hasActivity
(),
activity
)
self
.
assertTrue
(
obj
.
hasActivity
(),
activity
)
...
@@ -1943,7 +1671,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1943,7 +1671,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
test
(
active_process
,
active_process
=
active_process
)
test
(
active_process
,
active_process
=
active_process
)
test
(
active_process
,
active_process
=
active_process
.
getPath
())
test
(
active_process
,
active_process
=
active_process
.
getPath
())
def
_test_hasErrorActivity_error
(
self
,
activity
):
@
for_each_activity
def
test_hasErrorActivity_error
(
self
,
activity
):
# Monkey patch Organisation to add a failing method
# Monkey patch Organisation to add a failing method
def
failingMethod
(
self
):
def
failingMethod
(
self
):
raise
ValueError
(
'This method always fail'
)
raise
ValueError
(
'This method always fail'
)
...
@@ -1973,17 +1702,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -1973,17 +1702,11 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# assert that an error has been seen
# assert that an error has been seen
self
.
assertTrue
(
active_object
.
hasErrorActivity
())
self
.
assertTrue
(
active_object
.
hasErrorActivity
())
self
.
assertTrue
(
active_process
.
hasErrorActivity
())
self
.
assertTrue
(
active_process
.
hasErrorActivity
())
message
,
=
self
.
getMessageList
(
activity
)
self
.
deleteMessageList
(
activity
,
[
message
])
def
test_hasErrorActivity_error_SQLQueue
(
self
):
@
for_each_activity
self
.
_test_hasErrorActivity_error
(
'SQLQueue'
)
def
test_hasErrorActivity
(
self
,
activity
):
def
test_hasErrorActivity_error_SQLDict
(
self
):
self
.
_test_hasErrorActivity_error
(
'SQLDict'
)
def
test_hasErrorActivity_error_SQLJoblib
(
self
):
self
.
_test_hasErrorActivity_error
(
'SQLJoblib'
)
def
_test_hasErrorActivity
(
self
,
activity
):
active_object
=
self
.
portal
.
organisation_module
.
newContent
(
active_object
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
portal_type
=
'Organisation'
)
active_process
=
self
.
portal
.
portal_activities
.
newActiveProcess
()
active_process
=
self
.
portal
.
portal_activities
.
newActiveProcess
()
...
@@ -2009,15 +1732,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2009,15 +1732,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertFalse
(
active_object
.
hasErrorActivity
())
self
.
assertFalse
(
active_object
.
hasErrorActivity
())
self
.
assertFalse
(
active_process
.
hasErrorActivity
())
self
.
assertFalse
(
active_process
.
hasErrorActivity
())
def
test_hasErrorActivity_SQLQueue
(
self
):
self
.
_test_hasErrorActivity
(
'SQLQueue'
)
def
test_hasErrorActivity_SQLDict
(
self
):
self
.
_test_hasErrorActivity
(
'SQLDict'
)
def
test_hasErrorActivity_SQLJoblib
(
self
):
self
.
_test_hasErrorActivity
(
'SQLJoblib'
)
def
test_active_object_hasActivity_does_not_catch_exceptions
(
self
):
def
test_active_object_hasActivity_does_not_catch_exceptions
(
self
):
"""
"""
Some time ago, hasActivity was doing a silent try/except, and this was
Some time ago, hasActivity was doing a silent try/except, and this was
...
@@ -2047,9 +1761,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2047,9 +1761,14 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
finally
:
finally
:
DB
.
query
=
DB
.
original_query
DB
.
query
=
DB
.
original_query
del
DB
.
original_query
del
DB
.
original_query
self
.
tic
()
def
test_insert_max_payload
(
self
):
def
test_insert_max_payload
(
self
):
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
# XXX: For unknown reasons, this test runs faster after the tables are
# recreated. We could also make this test run before all others.
activity_tool
.
manageClearActivities
()
self
.
commit
()
max_allowed_packet
=
activity_tool
.
getSQLConnection
().
getMaxAllowedPacket
()
max_allowed_packet
=
activity_tool
.
getSQLConnection
().
getMaxAllowedPacket
()
insert_list
=
[]
insert_list
=
[]
invoke_list
=
[]
invoke_list
=
[]
...
@@ -2160,9 +1879,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2160,9 +1879,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
1
)
1
)
finally
:
finally
:
# Clear activities from all nodes
# Clear activities from all nodes
activity
.
deleteMessageList
(
activity_tool
.
getSQLConnection
(),
self
.
deleteMessageList
(
'SQLDict'
,
result
)
[
message
.
uid
for
message
in
result
])
self
.
commit
()
def
test_116_RaiseInCommitBeforeMessageExecution
(
self
):
def
test_116_RaiseInCommitBeforeMessageExecution
(
self
):
"""
"""
...
@@ -2174,7 +1891,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2174,7 +1891,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
.
__class__
.
doSomething
=
processed
.
append
activity_tool
.
__class__
.
doSomething
=
processed
.
append
try
:
try
:
for
activity
in
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
:
for
activity
in
ActivityTool
.
activity_dict
:
activity_tool
.
activate
(
activity
=
activity
).
doSomething
(
activity
)
activity_tool
.
activate
(
activity
=
activity
).
doSomething
(
activity
)
self
.
commit
()
self
.
commit
()
# Make first commit in dequeueMessage raise
# Make first commit in dequeueMessage raise
...
@@ -2228,8 +1945,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2228,8 +1945,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
# .. now no messages with this tag should apper
# .. now no messages with this tag should apper
self
.
assertEqual
(
0
,
portal
.
portal_activities
.
countMessageWithTag
(
tag
))
self
.
assertEqual
(
0
,
portal
.
portal_activities
.
countMessageWithTag
(
tag
))
def
TryNotificationSavedOnEventLogWhenNotifyUserRaises
(
self
,
activity
):
@
for_each_activity
activity_tool
=
self
.
getActivityTool
()
def
testTryNotificationSavedOnEventLogWhenNotifyUserRaises
(
self
,
activity
):
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
self
.
tic
()
self
.
tic
()
original_notifyUser
=
Message
.
notifyUser
.
im_func
original_notifyUser
=
Message
.
notifyUser
.
im_func
...
@@ -2245,38 +1962,21 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2245,38 +1962,21 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
obj
.
activate
(
activity
=
activity
,
priority
=
6
).
failingMethod
()
obj
.
activate
(
activity
=
activity
,
priority
=
6
).
failingMethod
()
self
.
commit
()
self
.
commit
()
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
message
,
=
activity_tool
.
getMessageList
(
)
message
,
=
self
.
getMessageList
(
activity
)
self
.
commit
()
self
.
commit
()
for
log_record
in
self
.
logged
:
for
log_record
in
self
.
logged
:
if
log_record
.
name
==
'ActivityTool'
and
log_record
.
levelname
==
'WARNING'
:
if
log_record
.
name
==
'ActivityTool'
and
log_record
.
levelname
==
'WARNING'
:
type
,
value
,
trace
=
log_record
.
exc_info
type
,
value
,
trace
=
log_record
.
exc_info
self
.
commit
()
self
.
commit
()
self
.
assertIs
(
activity_unit_test_error
,
value
)
self
.
assertIs
(
activity_unit_test_error
,
value
)
self
.
deleteMessageList
(
activity
,
[
message
])
finally
:
finally
:
Message
.
notifyUser
=
original_notifyUser
Message
.
notifyUser
=
original_notifyUser
del
Organisation
.
failingMethod
del
Organisation
.
failingMethod
self
.
_ignore_log_errors
()
self
.
_ignore_log_errors
()
def
test_118_userNotificationSavedOnEventLogWhenNotifyUserRaisesWithSQLDict
(
self
):
@
for_each_activity
"""
def
testTryUserMessageContainingNoTracebackIsStillSent
(
self
,
activity
):
Check the error is saved on event log even if the mail notification is not sent.
"""
self
.
TryNotificationSavedOnEventLogWhenNotifyUserRaises
(
'SQLDict'
)
def
test_119_userNotificationSavedOnEventLogWhenNotifyUserRaisesWithSQLQueue
(
self
):
"""
Check the error is saved on event log even if the mail notification is not sent.
"""
self
.
TryNotificationSavedOnEventLogWhenNotifyUserRaises
(
'SQLQueue'
)
def
test_120_userNotificationSavedOnEventLogWhenNotifyUserRaisesWithSQLJoblib
(
self
):
"""
Check the error is saved on event log even if the mail notification is not sent.
"""
self
.
TryNotificationSavedOnEventLogWhenNotifyUserRaises
(
'SQLJoblib'
)
def
TryUserMessageContainingNoTracebackIsStillSent
(
self
,
activity
):
activity_tool
=
self
.
getActivityTool
()
# With Message.__call__
# With Message.__call__
# 1: activity context does not exist when activity is executed
# 1: activity context does not exist when activity is executed
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
obj
=
self
.
portal
.
organisation_module
.
newContent
(
portal_type
=
'Organisation'
)
...
@@ -2294,33 +1994,18 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2294,33 +1994,18 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
obj
.
activate
(
activity
=
activity
).
failingMethod
()
obj
.
activate
(
activity
=
activity
).
failingMethod
()
self
.
commit
()
self
.
commit
()
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
self
.
flushAllActivities
(
silent
=
1
,
loop_size
=
100
)
message_list
=
activity_tool
.
getMessageList
()
message
,
=
self
.
getMessageList
(
activity
)
self
.
assertEqual
(
len
(
message_list
),
1
)
self
.
assertEqual
(
len
(
notification_done
),
1
)
self
.
assertEqual
(
len
(
notification_done
),
1
)
message
=
message_list
[
0
]
self
.
assertEqual
(
message
.
traceback
,
None
)
self
.
assertEqual
(
message
.
traceback
,
None
)
message
(
activity_tool
)
message
(
self
.
getActivityTool
())
activity_tool
.
manageCancel
(
message
.
object_path
,
message
.
method_id
)
self
.
deleteMessageList
(
activity
,
[
message
])
self
.
commit
()
finally
:
finally
:
Message
.
notifyUser
=
original_notifyUser
Message
.
notifyUser
=
original_notifyUser
del
Organisation
.
failingMethod
del
Organisation
.
failingMethod
def
test_121_sendMessageWithNoTracebackWithSQLQueue
(
self
):
@
for_each_activity
self
.
TryUserMessageContainingNoTracebackIsStillSent
(
'SQLQueue'
)
def
testTryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
self
,
activity
):
def
test_122_sendMessageWithNoTracebackWithSQLDict
(
self
):
self
.
TryUserMessageContainingNoTracebackIsStillSent
(
'SQLDict'
)
def
test_123_sendMessageWithNoTracebackWithSQLJoblib
(
self
):
"""
Check that message with no traceback is still sen
"""
self
.
TryUserMessageContainingNoTracebackIsStillSent
(
'SQLJoblib'
)
def
TryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
self
,
activity
):
# Make sure that no active object is installed.
# Make sure that no active object is installed.
activity_tool
=
self
.
portal
.
portal_activities
o
=
self
.
getOrganisation
()
o
=
self
.
getOrganisation
()
class
ActivityUnitTestError
(
Exception
):
class
ActivityUnitTestError
(
Exception
):
pass
pass
...
@@ -2339,7 +2024,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2339,7 +2024,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
_catch_log_errors
()
self
.
_catch_log_errors
()
o
.
activate
(
activity
=
activity
).
failingMethod
()
o
.
activate
(
activity
=
activity
).
failingMethod
()
self
.
commit
()
self
.
commit
()
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
1
)
message
,
=
self
.
getMessageList
(
activity
)
self
.
flushAllActivities
(
silent
=
1
)
self
.
flushAllActivities
(
silent
=
1
)
SiteErrorLog
.
raising
=
original_raising
SiteErrorLog
.
raising
=
original_raising
self
.
commit
()
self
.
commit
()
...
@@ -2347,32 +2032,12 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2347,32 +2032,12 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
if
log_record
.
name
==
'ActivityTool'
and
log_record
.
levelname
==
'WARNING'
:
if
log_record
.
name
==
'ActivityTool'
and
log_record
.
levelname
==
'WARNING'
:
type
,
value
,
trace
=
log_record
.
exc_info
type
,
value
,
trace
=
log_record
.
exc_info
self
.
assertIs
(
activity_unit_test_error
,
value
)
self
.
assertIs
(
activity_unit_test_error
,
value
)
self
.
deleteMessageList
(
activity
,
[
message
])
finally
:
finally
:
SiteErrorLog
.
raising
=
original_raising
SiteErrorLog
.
raising
=
original_raising
del
Organisation
.
failingMethod
del
Organisation
.
failingMethod
self
.
_ignore_log_errors
()
self
.
_ignore_log_errors
()
def
test_124_userNotificationSavedOnEventLogWhenSiteErrorLoggerRaisesWithSQLJoblib
(
self
):
"""
Check that message not saved in site error logger is not lost
"""
self
.
TryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
'SQLJoblib'
)
def
test_125_userNotificationSavedOnEventLogWhenSiteErrorLoggerRaisesWithSQLDict
(
self
):
"""
Check that message not saved in site error logger is not lost'
"""
self
.
TryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
'SQLDict'
)
def
test_125_userNotificationSavedOnEventLogWhenSiteErrorLoggerRaisesWithSQLJoblib
(
self
):
"""
Check that message not saved in site error logger is not lost'
"""
self
.
TryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
'SQLJoblib'
)
def
test_126_userNotificationSavedOnEventLogWhenSiteErrorLoggerRaisesWithSQLQueue
(
self
):
self
.
TryNotificationSavedOnEventLogWhenSiteErrorLoggerRaises
(
'SQLQueue'
)
def
test_128_CheckDistributeWithSerializationTagAndGroupMethodId
(
self
):
def
test_128_CheckDistributeWithSerializationTagAndGroupMethodId
(
self
):
activity_tool
=
self
.
portal
.
portal_activities
activity_tool
=
self
.
portal
.
portal_activities
obj1
=
activity_tool
.
newActiveProcess
()
obj1
=
activity_tool
.
newActiveProcess
()
...
@@ -2387,7 +2052,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2387,7 +2052,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
group_method_call_list
.
append
(
r
)
group_method_call_list
.
append
(
r
)
activity_tool
.
__class__
.
doSomething
=
doSomething
activity_tool
.
__class__
.
doSomething
=
doSomething
try
:
try
:
for
activity
in
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
:
for
activity
in
ActivityTool
.
activity_dict
:
activity_kw
=
dict
(
activity
=
activity
,
serialization_tag
=
self
.
id
(),
activity_kw
=
dict
(
activity
=
activity
,
serialization_tag
=
self
.
id
(),
group_method_id
=
'portal_activities/doSomething'
)
group_method_id
=
'portal_activities/doSomething'
)
obj1
.
activate
(
**
activity_kw
).
dummy
(
1
,
x
=
None
)
obj1
.
activate
(
**
activity_kw
).
dummy
(
1
,
x
=
None
)
...
@@ -2409,11 +2074,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2409,11 +2074,8 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
self
.
assertEqual
(
len
(
activity_tool
.
getMessageList
()),
2
)
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertEqual
(
group_method_call_list
.
pop
(),
self
.
assertEqual
(
group_method_call_list
.
pop
(),
dict
(
SQLDict
=
[
message2
],
[
message2
]
if
activity
!=
'SQLQueue'
else
[
message1
,
message2
])
SQLQueue
=
[
message1
,
message2
],
SQLJoblib
=
[
message2
])[
activity
])
self
.
assertFalse
(
group_method_call_list
)
self
.
assertFalse
(
group_method_call_list
)
self
.
assertFalse
(
activity_tool
.
getMessageList
())
finally
:
finally
:
del
activity_tool
.
__class__
.
doSomething
del
activity_tool
.
__class__
.
doSomething
...
@@ -2521,7 +2183,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2521,7 +2183,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
transaction
.
get
().
addBeforeCommitHook
(
_raise
,
(
error
,))
transaction
.
get
().
addBeforeCommitHook
(
_raise
,
(
error
,))
obj
.
__class__
.
doSomething
=
doSomething
obj
.
__class__
.
doSomething
=
doSomething
try
:
try
:
for
activity
in
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
:
for
activity
in
ActivityTool
.
activity_dict
:
for
conflict_error
in
False
,
True
:
for
conflict_error
in
False
,
True
:
weakref_list
=
[]
weakref_list
=
[]
obj
.
activity_count
=
obj
.
on_error_count
=
0
obj
.
activity_count
=
obj
.
on_error_count
=
0
...
@@ -2652,7 +2314,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2652,7 +2314,7 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
kw
=
{}
kw
=
{}
self
.
_catch_log_errors
(
subsystem
=
'CMFActivity'
)
self
.
_catch_log_errors
(
subsystem
=
'CMFActivity'
)
try
:
try
:
for
kw
[
'activity'
]
in
'SQLDict'
,
'SQLQueue'
,
'SQLJoblib'
:
for
kw
[
'activity'
]
in
ActivityTool
.
activity_dict
:
for
kw
[
'group_method_id'
]
in
''
,
None
:
for
kw
[
'group_method_id'
]
in
''
,
None
:
obj
=
activity_tool
.
newActiveProcess
()
obj
=
activity_tool
.
newActiveProcess
()
self
.
tic
()
self
.
tic
()
...
@@ -2739,7 +2401,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
...
@@ -2739,7 +2401,6 @@ class TestCMFActivity(ERP5TypeTestCase, LogInterceptor):
self
.
commit
()
self
.
commit
()
activity_tool
.
timeShift
(
VALIDATION_ERROR_DELAY
)
activity_tool
.
timeShift
(
VALIDATION_ERROR_DELAY
)
activity_tool
.
tic
()
activity_tool
.
tic
()
self
.
assertFalse
(
activity_tool
.
getMessageList
())
finally
:
finally
:
del
obj
.
__class__
.
doSomething
del
obj
.
__class__
.
doSomething
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment