SVN: ZODB/trunk/src/ZODB/tests/BasicStorage.py Be nice and use loadable test data in the new check_checkCurrentSerialInTransaction test. This allows the tempstorage tests to pass again, which directly reuse the BasicStorage protocol tests.
Hanno Schlichting <[email protected]> Sat, 25 Sep 2010 10:19:52 -0400 (EDT)
| Newsgroups | gmane.comp.python.zope.zodb.cvs |
|---|---|
| Message-ID | <20100925141952.65E2B941C0__41647.1710465432$1285424398$gmane$org@cvs.zope.org> |
Log message for revision 116920:
Be nice and use loadable test data in the new check_checkCurrentSerialInTransaction test. This allows the tempstorage tests to pass again, which directly reuse the BasicStorage protocol tests.
Changed:
U ZODB/trunk/src/ZODB/tests/BasicStorage.py
-=-
Modified: ZODB/trunk/src/ZODB/tests/BasicStorage.py
===================================================================
--- ZODB/trunk/src/ZODB/tests/BasicStorage.py 2010-09-25 14:12:41 UTC (rev 116919)
+++ ZODB/trunk/src/ZODB/tests/BasicStorage.py 2010-09-25 14:19:52 UTC (rev 116920)
@@ -221,6 +221,7 @@
oid = '\0\0\0\0\0\0\0\xf0'
tid = self._dostore(oid)
tid2 = self._dostore(oid, revid=tid)
+ data = 'cpersistent\nPersistent\nq\x01.N.' # a simple persistent obj
#----------------------------------------------------------------------
# stale read
@@ -229,7 +230,7 @@
self._storage.tpc_begin(t)
try:
self._storage.store('\0\0\0\0\0\0\0\xf1',
- '\0\0\0\0\0\0\0\0', 'x', '', t)
+ '\0\0\0\0\0\0\0\0', data, '', t)
self._storage.checkCurrentSerialInTransaction(oid, tid, t)
self._storage.tpc_vote(t)
except POSException.ReadConflictError, v:
@@ -247,7 +248,7 @@
t = transaction.get()
self._storage.tpc_begin(t)
self._storage.store('\0\0\0\0\0\0\0\xf2',
- '\0\0\0\0\0\0\0\0', 'x', '', t)
+ '\0\0\0\0\0\0\0\0', data, '', t)
self._storage.checkCurrentSerialInTransaction(oid, tid2, t)
self._storage.tpc_vote(t)
self._storage.tpc_finish(t)
@@ -259,7 +260,7 @@
t = transaction.get()
self._storage.tpc_begin(t)
self._storage.store('\0\0\0\0\0\0\0\xf3',
- '\0\0\0\0\0\0\0\0', 'x', '', t)
+ '\0\0\0\0\0\0\0\0', data, '', t)
self._storage.checkCurrentSerialInTransaction(oid, tid2, t)
self._storage.tpc_vote(t)
@@ -277,7 +278,7 @@
t = transaction.get()
self._storage.tpc_begin(t)
self._storage.store('\0\0\0\0\0\0\0\xf4',
- '\0\0\0\0\0\0\0\0', 'x', '', t)
+ '\0\0\0\0\0\0\0\0', data, '', t)
self._storage.checkCurrentSerialInTransaction(oid, tid3, t)
thread = self._do_store_in_separate_thread(oid, tid3, False)