[Zope3-checkins] CVS: Zope3/src/zodb/storage/tests - __init__.py:1.1.2.2 base.py:1.1.2.5 basic.py:1.1.2.3 bdbmixin.py:1.1.2.3 conflict.py:1.1.2.2 corruption.py:1.1.2.3 history.py:1.1.2.2 iterator.py:1.1.2.2 local.py:1.1.2.2 minpo.py:1.1.2.2 mt.py:1.1.2.3 packable.py:1.1.2.2 persistent.py:1.1.2.2 recovery.py:1.1.2.2 revision.py:1.1.2.2 speed.py:1.1.2.3 synchronization.py:1.1.2.2 test_file.py:1.1.2.6 test_fsindex.py:1.1.2.2 test_mapping.py:1.1.2.3 test_virgin.py:1.1.2.3 test_zodb_simple.py:1.1.2.3 timeiter.py:1.1.2.2 timepickles.py:1.1.2.2 undo.py:1.1.2.3 undoversion.py:1.1.2.3 version.py:1.1.2.3
Tim Peters
tim.one@comcast.net
Tue, 24 Dec 2002 21:21:37 -0500
Update of /cvs-repository/Zope3/src/zodb/storage/tests
In directory cvs.zope.org:/tmp/cvs-serv19240/src/zodb/storage/tests
Modified Files:
Tag: NameGeddon-branch
__init__.py base.py basic.py bdbmixin.py conflict.py
corruption.py history.py iterator.py local.py minpo.py mt.py
packable.py persistent.py recovery.py revision.py speed.py
synchronization.py test_file.py test_fsindex.py
test_mapping.py test_virgin.py test_zodb_simple.py timeiter.py
timepickles.py undo.py undoversion.py version.py
Log Message:
Whitespace normalization, via Python's Tools/scripts/reindent.py. The
files are fixed-points of that script now. Fixed a few cases where
code relied on significant trailing whitespace (ouch).
=== Zope3/src/zodb/storage/tests/__init__.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/__init__.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/__init__.py Tue Dec 24 21:20:04 2002
@@ -2,13 +2,13 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
# Having this makes debugging better.
=== Zope3/src/zodb/storage/tests/base.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zodb/storage/tests/base.py:1.1.2.4 Tue Dec 24 12:12:46 2002
+++ Zope3/src/zodb/storage/tests/base.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Provide a mixin base class for storage tests.
=== Zope3/src/zodb/storage/tests/basic.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/basic.py:1.1.2.2 Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/basic.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Run the basic tests for a storage as described in the official storage API
=== Zope3/src/zodb/storage/tests/bdbmixin.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/bdbmixin.py:1.1.2.2 Tue Dec 24 12:11:53 2002
+++ Zope3/src/zodb/storage/tests/bdbmixin.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Provide a mixin base class for Berkeley storage tests.
=== Zope3/src/zodb/storage/tests/conflict.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/conflict.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/conflict.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Tests for application-level conflict resolution."""
@@ -75,7 +75,7 @@
obj.inc()
# The effect of committing two transactions with the same
# pickle is to commit two different transactions relative to
- # revid1 that add two to _value.
+ # revid1 that add two to _value.
revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
revid3 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
@@ -98,7 +98,7 @@
obj.inc()
# The effect of committing two transactions with the same
# pickle is to commit two different transactions relative to
- # revid1 that add two to _value.
+ # revid1 that add two to _value.
revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
self.assertRaises(ConflictError,
self._dostoreNP,
@@ -117,7 +117,7 @@
obj.inc()
# The effect of committing two transactions with the same
# pickle is to commit two different transactions relative to
- # revid1 that add two to _value.
+ # revid1 that add two to _value.
revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
self.assertRaises(ConflictError,
self._dostoreNP,
@@ -135,7 +135,7 @@
obj.inc()
# The effect of committing two transactions with the same
# pickle is to commit two different transactions relative to
- # revid1 that add two to _value.
+ # revid1 that add two to _value.
revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
self.assertRaises(AttributeError,
self._dostoreNP,
@@ -153,7 +153,7 @@
obj.inc()
# The effect of committing two transactions with the same
# pickle is to commit two different transactions relative to
- # revid1 that add two to _value.
+ # revid1 that add two to _value.
revid2 = self._dostoreNP(oid, revid=revid1, data=zodb_pickle(obj))
self.assertRaises(TypeError,
self._dostoreNP,
@@ -165,7 +165,7 @@
# This test is based on checkNotUndoable in the
# TransactionalUndoStorage test suite. Except here, conflict
# resolution should allow us to undo the transaction anyway.
-
+
obj = RPCounter()
obj.inc()
oid = self._storage.new_oid()
@@ -186,7 +186,7 @@
# This test is based on checkNotUndoable in the
# TransactionalUndoStorage test suite. Except here, conflict
# resolution should allow us to undo the transaction anyway.
-
+
obj = PCounter2()
obj.inc()
oid = self._storage.new_oid()
@@ -203,4 +203,3 @@
self.assertRaises(UndoError, self._storage.transactionalUndo,
tid, t)
self._storage.tpc_abort(t)
-
=== Zope3/src/zodb/storage/tests/corruption.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/corruption.py:1.1.2.2 Mon Dec 23 18:48:43 2002
+++ Zope3/src/zodb/storage/tests/corruption.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Do some minimal tests of data corruption"""
@@ -51,7 +51,7 @@
def checkTruncatedIndex(self):
oids = self._do_stores()
self._close()
-
+
# truncation the index file
path = self.path + '.index'
self.failUnless(os.path.exists(path))
@@ -68,7 +68,7 @@
def checkCorruptedIndex(self):
oids = self._do_stores()
self._close()
-
+
# truncation the index file
path = self.path + '.index'
self.failUnless(os.path.exists(path))
=== Zope3/src/zodb/storage/tests/history.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/history.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/history.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Run the history() related tests for a storage.
=== Zope3/src/zodb/storage/tests/iterator.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/iterator.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/iterator.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Run tests against the iterator() interface for storages.
=== Zope3/src/zodb/storage/tests/local.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/local.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/local.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
class LocalStorage:
"""A single test that only make sense for local storages.
=== Zope3/src/zodb/storage/tests/minpo.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/minpo.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/minpo.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""A minimal persistent object to use for tests"""
=== Zope3/src/zodb/storage/tests/mt.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/mt.py:1.1.2.2 Mon Dec 23 18:48:43 2002
+++ Zope3/src/zodb/storage/tests/mt.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import random
import threading
@@ -187,7 +187,7 @@
t.join(60)
for t in threads:
self.failIf(t.isAlive(), "thread failed to finish in 60 seconds")
-
+
def check2ZODBThreads(self):
db = zodb.db.DB(self._storage)
self._checkNThreads(2, ZODBClientThread, db, self)
@@ -198,10 +198,9 @@
def check2StorageThreads(self):
self._checkNThreads(2, StorageClientThread, self._storage, self)
-
+
def check7StorageThreads(self):
self._checkNThreads(7, StorageClientThread, self._storage, self)
def check4ExtStorageThread(self):
self._checkNThreads(4, ExtStorageClientThread, self._storage, self)
-
=== Zope3/src/zodb/storage/tests/packable.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/packable.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/packable.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Run some tests relevant for storages that support pack()."""
@@ -140,11 +140,11 @@
def checkPackTomorrow(self):
self._initroot()
self._storage.pack(time.time() + 100000)
-
+
def checkPackYesterday(self):
self._initroot()
self._storage.pack(time.time() - 100000)
-
+
def checkPackAllRevisions(self):
self._initroot()
eq = self.assertEqual
@@ -327,7 +327,7 @@
pobj = pickle.loads(data)
eq(pobj.getoid(), oid2)
eq(pobj.value, 11)
-
+
def checkPackUnlinkedFromRoot(self):
eq = self.assertEqual
db = DB(self._storage)
@@ -355,7 +355,7 @@
txn.commit()
self._storage.pack(packtime)
-
+
log = self._storage.undoLog()
tid = log[0]['id']
db.undo(tid)
=== Zope3/src/zodb/storage/tests/persistent.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/persistent.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/persistent.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Test that a storage's values persist across open and close."""
@@ -17,7 +17,7 @@
def checkUpdatesPersist(self):
oids = []
-
+
def new_oid_wrapper(l=oids, new_oid=self._storage.new_oid):
oid = new_oid()
l.append(oid)
@@ -43,7 +43,7 @@
if ver:
p, s = self._storage.load(oid, ver)
objects.append((oid, ver, p, s))
-
+
self._storage.close()
self.open()
=== Zope3/src/zodb/storage/tests/recovery.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/recovery.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/recovery.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""More recovery and iterator tests.
@@ -75,7 +75,7 @@
self.assertRaises(IndexError, lambda i, t=trans: t[i], 1)
self.assertEqual(data.oid, oid)
self.assertEqual(data.data, None)
-
+
def checkRecoverUndoInVersion(self):
oid = self._storage.new_oid()
version = "aVersion"
@@ -132,7 +132,7 @@
self._dst = self.new_dest()
self._dst.copyTransactionsFrom(self._storage)
self.compare(self._storage, self._dst)
-
+
def checkRestoreAcrossPack(self):
db = DB(self._storage)
c = db.open()
=== Zope3/src/zodb/storage/tests/revision.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/revision.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/revision.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Check loadSerial() on storages that support historical revisions."""
@@ -19,7 +19,7 @@
ZERO = '\0'*8
class RevisionStorage:
-
+
def checkLoadSerial(self):
oid = self._storage.new_oid()
revid = ZERO
@@ -31,4 +31,3 @@
for revid, value in revisions.items():
data = self._storage.loadSerial(oid, revid)
self.assertEqual(zodb_unpickle(data), value)
-
=== Zope3/src/zodb/storage/tests/speed.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/speed.py:1.1.2.2 Mon Dec 23 18:48:43 2002
+++ Zope3/src/zodb/storage/tests/speed.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
usage="""Test speed of a ZODB storage
@@ -34,7 +34,7 @@
-M Output means only
"""
-
+
import sys, os, getopt, string, time
sys.path.insert(0, os.getcwd())
@@ -112,11 +112,11 @@
sys.stderr.write("mean:\t%s\t%.4f\t%.4f (s/o)\n" % (r, t, t/r))
db.close()
-
-
+
+
def compress(s):
c=zlib.compressobj()
o=c.compress(s)
- return o+c.flush()
+ return o+c.flush()
if __name__=='__main__': main(sys.argv[1:])
=== Zope3/src/zodb/storage/tests/synchronization.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/synchronization.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/synchronization.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Test the storage's implemenetation of the storage synchronization spec.
@@ -74,7 +74,7 @@
## def verifyCommitting(self, callable, *args):
## self.assertRaises(StorageTransactionError, callable *args)
-
+
def verifyNotCommitting(self, callable, *args):
args = (StorageTransactionError, callable) + args
apply(self.assertRaises, args)
@@ -105,17 +105,17 @@
def checkStoreNotCommitting(self):
self.verifyNotCommitting(self._storage.store,
OID, SERIALNO, "", "", Transaction())
-
+
def checkStoreWrongTrans(self):
self.verifyWrongTrans(self._storage.store,
OID, SERIALNO, "", "", Transaction())
## def checkNewOidNotCommitting(self):
## self.verifyNotCommitting(self._storage.new_oid)
-
+
## def checkNewOidWrongTrans(self):
## self.verifyWrongTrans(self._storage.new_oid)
-
+
def checkAbortNotCommitting(self):
self._storage.tpc_abort(Transaction())
@@ -136,7 +136,7 @@
self._storage.tpc_begin(t)
self._storage.tpc_finish(Transaction())
self._storage.tpc_abort(t)
-
+
def checkBeginCommitting(self):
t = Transaction()
self._storage.tpc_begin(t)
=== Zope3/src/zodb/storage/tests/test_file.py 1.1.2.5 => 1.1.2.6 ===
--- Zope3/src/zodb/storage/tests/test_file.py:1.1.2.5 Mon Dec 23 18:48:43 2002
+++ Zope3/src/zodb/storage/tests/test_file.py Tue Dec 24 21:20:04 2002
@@ -104,4 +104,3 @@
alltests=test_suite()
runner = unittest.TextTestRunner()
runner.run(alltests)
-
=== Zope3/src/zodb/storage/tests/test_fsindex.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/test_fsindex.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/test_fsindex.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import unittest, sys
@@ -27,7 +27,7 @@
for i in range(0,200):
self.assertEqual((i,index[p64(i*1000)]), (i,(i*1000L+1)))
-
+
self.assertEqual(len(index), 200)
key=p64(2000)
@@ -51,12 +51,12 @@
for i in range(400,600):
d[p64(i*1000)]=(i*1000L+1)
-
+
index.update(d)
for i in range(100, 500):
d[p64(i*1000)]=(i*1000L+2)
-
+
index.update(d)
self.assertEqual(index.get(p64(2000)), 2001)
=== Zope3/src/zodb/storage/tests/test_mapping.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/test_mapping.py:1.1.2.2 Mon Dec 23 17:14:54 2002
+++ Zope3/src/zodb/storage/tests/test_mapping.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
import zodb.storage.mapping
import os, unittest
@@ -35,4 +35,3 @@
loader = unittest.TestLoader()
loader.testMethodPrefix = "check"
unittest.main(testLoader=loader)
-
=== Zope3/src/zodb/storage/tests/test_virgin.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/test_virgin.py:1.1.2.2 Tue Dec 24 11:20:34 2002
+++ Zope3/src/zodb/storage/tests/test_virgin.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
# Test creation of a brand new database, and insertion of root objects.
@@ -24,7 +24,7 @@
from zodb.storage.tests.base import ZODBTestBase
from transaction import get_transaction
from persistence.dict import PersistentDict
-
+
class InsertMixin:
=== Zope3/src/zodb/storage/tests/test_zodb_simple.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/test_zodb_simple.py:1.1.2.2 Tue Dec 24 11:20:34 2002
+++ Zope3/src/zodb/storage/tests/test_zodb_simple.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
try:
=== Zope3/src/zodb/storage/tests/timeiter.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/timeiter.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/timeiter.py Tue Dec 24 21:20:04 2002
@@ -4,14 +4,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Time transaction commits and normalize vs. pickle size and #objects.
@@ -240,10 +240,10 @@
for r in txn:
oid = r.oid
objects += 1
- thissize = len(r.data)
+ thissize = len(r.data)
size += thissize
- if thissize > largest_pickle:
- largest_pickle = thissize
+ if thissize > largest_pickle:
+ largest_pickle = thissize
if verbose:
if not r.version:
vstr = 'norev'
@@ -266,10 +266,10 @@
traceback.print_exc(file=logfp)
# record the results
- if objects > largest_txn_in_objects:
- largest_txn_in_objects = objects
- if size > largest_txn_in_size:
- largest_txn_in_size = size
+ if objects > largest_txn_in_objects:
+ largest_txn_in_objects = objects
+ if size > largest_txn_in_size:
+ largest_txn_in_size = size
print >> outfp, utils.U64(tid), objects, size, t4-t0, \
t1-t0, t2-t1, t3-t2, t4-t3
=== Zope3/src/zodb/storage/tests/timepickles.py 1.1.2.1 => 1.1.2.2 ===
--- Zope3/src/zodb/storage/tests/timepickles.py:1.1.2.1 Mon Dec 23 14:30:50 2002
+++ Zope3/src/zodb/storage/tests/timepickles.py Tue Dec 24 21:20:04 2002
@@ -4,14 +4,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE
-#
+#
##############################################################################
"""Time transaction commits and normalize vs. pickle size and #objects.
@@ -206,7 +206,7 @@
from bsddb3 import db
env = db.DBEnv()
- env.open('BDB',
+ env.open('BDB',
db.DB_CREATE # create underlying files as necessary
| db.DB_RECOVER # run normal recovery before opening
| db.DB_INIT_MPOOL # initialize shared memory buffer pool
@@ -252,34 +252,34 @@
t1 = time.time()
try:
- dbtxn = env.txn_begin()
+ dbtxn = env.txn_begin()
for r in txn:
oid = r.oid
objects += 1
- thissize = len(r.data)
+ thissize = len(r.data)
size += thissize
- if thissize > largest_pickle:
- largest_pickle = thissize
+ if thissize > largest_pickle:
+ largest_pickle = thissize
if verbose:
if not r.version:
vstr = 'norev'
else:
vstr = r.version
print utils.U64(oid), vstr, len(r.data)
- key = oid + tid
- d.put(key, r.data, txn=dbtxn)
+ key = oid + tid
+ d.put(key, r.data, txn=dbtxn)
t2 = time.time()
t3 = time.time()
- dbtxn.commit()
+ dbtxn.commit()
t4 = time.time()
except KeyError, e:
traceback.print_exc(file=logfp)
# record the results
- if objects > largest_txn_in_objects:
- largest_txn_in_objects = objects
- if size > largest_txn_in_size:
- largest_txn_in_size = size
+ if objects > largest_txn_in_objects:
+ largest_txn_in_objects = objects
+ if size > largest_txn_in_size:
+ largest_txn_in_size = size
print >> outfp, utils.U64(tid), objects, size, t4-t0, \
t1-t0, t2-t1, t3-t2, t4-t3
=== Zope3/src/zodb/storage/tests/undo.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/undo.py:1.1.2.2 Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/undo.py Tue Dec 24 21:20:04 2002
@@ -583,7 +583,7 @@
s.transactionalUndo(tid, t)
s.tpc_vote(t)
s.tpc_finish(t)
-
+
for i in range(BATCHES):
undo(i)
@@ -600,14 +600,14 @@
for i in range(BATCHES):
txn = iter[offset]
offset += 1
-
+
tid = p64(i + 1)
eq(txn.tid, tid)
L1 = [(rec.oid, rec.serial, rec.data_txn) for rec in txn]
L2 = [(oid, revid, None) for _tid, oid, revid in orig
if _tid == tid]
-
+
eq(L1, L2)
for i in range(BATCHES * OBJECTS):
=== Zope3/src/zodb/storage/tests/undoversion.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/undoversion.py:1.1.2.2 Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/undoversion.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
# Check interactions between transactionalUndo() and versions. Any storage
# that supports both transactionalUndo() and versions must pass these tests.
=== Zope3/src/zodb/storage/tests/version.py 1.1.2.2 => 1.1.2.3 ===
--- Zope3/src/zodb/storage/tests/version.py:1.1.2.2 Mon Dec 23 16:52:53 2002
+++ Zope3/src/zodb/storage/tests/version.py Tue Dec 24 21:20:04 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 2001, 2002 Zope Corporation and Contributors.
# All Rights Reserved.
-#
+#
# This software is subject to the provisions of the Zope Public License,
# Version 2.0 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
-#
+#
##############################################################################
"""Run the version related tests for a storage.
@@ -32,7 +32,7 @@
# And now store some new revisions in a version
version = 'test-version'
revid = self._dostore(oid, revid=revid, data=MinPO(13),
- version=version)
+ version=version)
revid = self._dostore(oid, revid=revid, data=MinPO(14),
version=version)
revid = self._dostore(oid, revid=revid, data=MinPO(15),
@@ -135,12 +135,12 @@
def checkAbortVersion(self):
eq = self.assertEqual
oid, version = self._setup_version()
-
+
# XXX Not sure I can write a test for getSerial() in the
# presence of aborted versions, because FileStorage and
# Berkeley storage give a different answer. I think Berkeley
# is right and FS is wrong.
-
+
## s1 = self._storage.getSerial(oid)
# Now abort the version -- must be done in a transaction
t = Transaction()
@@ -169,7 +169,7 @@
self.assertRaises(interfaces.VersionError,
self._storage.abortVersion,
'', t)
-
+
# But now we really try to abort the version
oids = self._storage.abortVersion(version, t)
self._storage.tpc_vote(t)
@@ -249,7 +249,7 @@
eq(zodb_unpickle(data), MinPO(51))
data, revid2 = self._storage.load(oid1, '')
eq(zodb_unpickle(data), MinPO(51))
-
+
# Okay, now let's commit object1 to version2
t = Transaction()
self._storage.tpc_begin(t)
@@ -265,7 +265,7 @@
eq(zodb_unpickle(data), MinPO(54))
# an object can only exist in one version, so a load from
- # version1 should now give the non-version data
+ # version1 should now give the non-version data
data, revid2 = self._storage.load(oid1, version1)
eq(zodb_unpickle(data), MinPO(51))