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
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Romain Courteaud
erp5
Commits
9f8c1492
Commit
9f8c1492
authored
Jan 03, 2013
by
Julien Muchembled
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix random failure of testConflictResolution.TestERP5.testActiveProcess
parent
77f9030e
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py
...ict_resolution/TestTemplateItem/testConflictResolution.py
+2
-0
bt5/test_conflict_resolution/bt/revision
bt5/test_conflict_resolution/bt/revision
+1
-1
No files found.
bt5/test_conflict_resolution/TestTemplateItem/testConflictResolution.py
View file @
9f8c1492
...
...
@@ -119,6 +119,8 @@ class TestERP5(ERP5TypeTestCase):
active_process
=
self
.
portal
.
portal_activities
.
newActiveProcess
()
self
.
commit
()
remote
=
self
.
other_node
remote
.
getId
()
# force storage sync of remote ZODB connection
# (see also Products.ERP5Type.patches.ZODBConnection)
for
id
in
active_process
.
getRelativeUrl
().
split
(
'/'
):
remote
=
getattr
(
remote
,
id
)
for
x
in
xrange
(
100
):
...
...
bt5/test_conflict_resolution/bt/revision
View file @
9f8c1492
4
\ No newline at end of file
5
\ No newline at end of file
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