Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
ZODB
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
Kirill Smelkov
ZODB
Commits
32b00aba
Commit
32b00aba
authored
8 years ago
by
Jim Fulton
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master' into storage-byte-appreciation
Conflicts: doc/guide/transactions-and-threading.rst
parents
1ebbdf77
cc1f9222
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
src/ZODB/tests/BasicStorage.py
src/ZODB/tests/BasicStorage.py
+2
-2
No files found.
src/ZODB/tests/BasicStorage.py
View file @
32b00aba
...
@@ -228,8 +228,8 @@ class BasicStorage:
...
@@ -228,8 +228,8 @@ class BasicStorage:
self
.
_storage
.
checkCurrentSerialInTransaction
(
oid
,
tid
,
t
)
self
.
_storage
.
checkCurrentSerialInTransaction
(
oid
,
tid
,
t
)
self
.
_storage
.
tpc_vote
(
t
)
self
.
_storage
.
tpc_vote
(
t
)
except
POSException
.
ReadConflictError
as
v
:
except
POSException
.
ReadConflictError
as
v
:
self
.
assert
True
(
v
.
oid
)
==
oid
self
.
assert
Equal
(
v
.
oid
,
oid
)
self
.
assert
True
(
v
.
serials
==
(
tid2
,
tid
))
self
.
assert
Equal
(
v
.
serials
,
(
tid2
,
tid
))
else
:
else
:
if
0
:
self
.
assertTrue
(
False
,
"No conflict error"
)
if
0
:
self
.
assertTrue
(
False
,
"No conflict error"
)
...
...
This diff is collapsed.
Click to expand it.
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