Commit fad6649b authored by Tim Peters's avatar Tim Peters

_setstate_noncurrent(): New assert. Hoping to get closer to the true

cause of the:

  TypeError: unpack() argument 2 must be string or read-only buffer, not None

failure often seen in overnight testrunner reports now, coming from the
checkConcurrentUpdatesInVersions test.  If the hypothesis is correct,
we'll see a failure of the new

        assert end is not None

instead.
parent 3c37847f
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
############################################################################## ##############################################################################
"""Database connection support """Database connection support
$Id: Connection.py,v 1.153 2004/04/16 20:26:16 jeremy Exp $""" $Id: Connection.py,v 1.154 2004/04/19 20:24:02 tim_one Exp $"""
import logging import logging
import sys import sys
...@@ -572,9 +572,9 @@ class Connection(ExportImport, object): ...@@ -572,9 +572,9 @@ class Connection(ExportImport, object):
# calls add(), the newly added objects will show up in # calls add(), the newly added objects will show up in
# _added_during_commit. This sounds insane, but has actually # _added_during_commit. This sounds insane, but has actually
# happened. # happened.
self._added_during_commit = [] self._added_during_commit = []
for obj in self._registered_objects: for obj in self._registered_objects:
oid = obj._p_oid oid = obj._p_oid
assert oid assert oid
...@@ -875,6 +875,7 @@ class Connection(ExportImport, object): ...@@ -875,6 +875,7 @@ class Connection(ExportImport, object):
# been modified at txn_time. # been modified at txn_time.
assert start < self._txn_time, (u64(start), u64(self._txn_time)) assert start < self._txn_time, (u64(start), u64(self._txn_time))
assert end is not None
assert self._txn_time <= end, (u64(self._txn_time), u64(end)) assert self._txn_time <= end, (u64(self._txn_time), u64(end))
self._reader.setGhostState(obj, data) self._reader.setGhostState(obj, data)
obj._p_serial = start obj._p_serial = start
......
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