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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Xiaowu Zhang
erp5
Commits
e18266a2
Commit
e18266a2
authored
May 10, 2016
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make functional tests stop waiting for activities as soon as they're all in failed state
parent
e2fa25fc
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
67 deletions
+25
-67
bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py
...emplateItem/portal_components/extension.erp5.ERP5Zuite.py
+20
-0
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_waitForActivities.py
...portal_skins/erp5_ui_test_core/Zuite_waitForActivities.py
+0
-16
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_waitForActivities.xml
...ortal_skins/erp5_ui_test_core/Zuite_waitForActivities.xml
+5
-51
No files found.
bt5/erp5_ui_test_core/ExtensionTemplateItem/portal_components/extension.erp5.ERP5Zuite.py
View file @
e18266a2
from
time
import
sleep
def
waitForActivities
(
self
,
count
=
1000
):
"""
We wait until all activities are finished
RuntimeError is raised in case there is no way
to finish activities.
"""
activity_tool
=
self
.
getPortalObject
().
portal_activities
for
x
in
xrange
(
count
):
x
=
activity_tool
.
getMessageList
()
if
not
x
:
return
'Done.'
if
all
(
x
.
processing_node
==
-
2
for
x
in
x
):
break
activity_tool
.
process_timer
(
None
,
None
)
sleep
(
1
)
raise
RuntimeError
(
'tic is looping forever.'
)
def
UpdateImage
(
image
):
image
.
_update_image_info
()
...
...
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_waitForActivities.py
deleted
100644 → 0
View file @
e2fa25fc
"""
We wait until all activities are finished
RuntimeError is raised in case there is no way
to finish activities.
"""
from
Products.ERP5Type.Utils
import
sleep
count
=
int
(
count
)
while
len
(
context
.
portal_activities
.
getMessageList
())
>
0
:
context
.
portal_activities
.
process_timer
(
0
,
0
)
count
-=
1
sleep
(
t
=
1
)
if
count
<
0
:
raise
RuntimeError
,
'tic is endless'
return
'Done.'
bt5/erp5_ui_test_core/SkinTemplateItem/portal_skins/erp5_ui_test_core/Zuite_waitForActivities.xml
View file @
e18266a2
...
...
@@ -2,63 +2,17 @@
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"
PythonScript"
module=
"Products.PythonScripts.PythonScript
"
/>
<global
name=
"
ExternalMethod"
module=
"Products.ExternalMethod.ExternalMethod
"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
Script_magic
</string>
</key>
<value>
<
int>
3
</int
>
</value>
<key>
<string>
_function
</string>
</key>
<value>
<
string>
waitForActivities
</string
>
</value>
</item>
<item>
<key>
<string>
_bind_names
</string>
</key>
<value>
<object>
<klass>
<global
name=
"NameAssignments"
module=
"Shared.DC.Scripts.Bindings"
/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key>
<string>
_asgns
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
name_container
</string>
</key>
<value>
<string>
container
</string>
</value>
</item>
<item>
<key>
<string>
name_context
</string>
</key>
<value>
<string>
context
</string>
</value>
</item>
<item>
<key>
<string>
name_m_self
</string>
</key>
<value>
<string>
script
</string>
</value>
</item>
<item>
<key>
<string>
name_subpath
</string>
</key>
<value>
<string>
traverse_subpath
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
count = 1000
</string>
</value>
</item>
<item>
<key>
<string>
_proxy_roles
</string>
</key>
<value>
<tuple>
<string>
Manager
</string>
</tuple>
</value>
<key>
<string>
_module
</string>
</key>
<value>
<string>
ERP5Zuite
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
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