[Zope-Checkins] CVS: ZODB3/BDBStorage/tests - ZODBTestBase.py:1.7.24.1 __init__.py:1.2.42.1 test_virgin.py:1.12.22.1 test_zodb_simple.py:1.10.22.1 testall.py:1.13.24.1 timeiter.py:1.4.24.2 timepickles.py:1.3.24.2
Tim Peters
tim.one@comcast.net
Tue, 1 Jul 2003 16:57:33 -0400
Update of /cvs-repository/ZODB3/BDBStorage/tests
In directory cvs.zope.org:/tmp/cvs-serv9924/BDBStorage/tests
Modified Files:
Tag: zodb33-devel-branch
ZODBTestBase.py __init__.py test_virgin.py test_zodb_simple.py
testall.py timeiter.py timepickles.py
Log Message:
Whitespace normalization.
=== ZODB3/BDBStorage/tests/ZODBTestBase.py 1.7 => 1.7.24.1 ===
--- ZODB3/BDBStorage/tests/ZODBTestBase.py:1.7 Wed Dec 18 17:15:03 2002
+++ ZODB3/BDBStorage/tests/ZODBTestBase.py Tue Jul 1 16:57:01 2003
@@ -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
-#
+#
##############################################################################
# Base class for unit tests at the ZODB layer
=== ZODB3/BDBStorage/tests/__init__.py 1.2 => 1.2.42.1 ===
--- ZODB3/BDBStorage/tests/__init__.py:1.2 Mon Feb 11 18:40:43 2002
+++ ZODB3/BDBStorage/tests/__init__.py Tue Jul 1 16:57:01 2003
@@ -2,12 +2,12 @@
#
# 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
-#
+#
##############################################################################
=== ZODB3/BDBStorage/tests/test_virgin.py 1.12 => 1.12.22.1 ===
--- ZODB3/BDBStorage/tests/test_virgin.py:1.12 Fri Jan 3 17:47:10 2003
+++ ZODB3/BDBStorage/tests/test_virgin.py Tue Jul 1 16:57:01 2003
@@ -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.
@@ -19,7 +19,7 @@
import BDBStorage
from BDBStorage.tests.ZODBTestBase import ZODBTestBase
from Persistence import PersistentMapping
-
+
class InsertMixin:
=== ZODB3/BDBStorage/tests/test_zodb_simple.py 1.10 => 1.10.22.1 ===
--- ZODB3/BDBStorage/tests/test_zodb_simple.py:1.10 Fri Jan 3 17:47:10 2003
+++ ZODB3/BDBStorage/tests/test_zodb_simple.py Tue Jul 1 16:57:01 2003
@@ -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 some simple ZODB level stuff common to both the BDBMinimalStorage and
=== ZODB3/BDBStorage/tests/testall.py 1.13 => 1.13.24.1 ===
--- ZODB3/BDBStorage/tests/testall.py:1.13 Fri Oct 4 20:40:17 2002
+++ ZODB3/BDBStorage/tests/testall.py Tue Jul 1 16:57:01 2003
@@ -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
-#
+#
##############################################################################
# Framework for running Unit tests
=== ZODB3/BDBStorage/tests/timeiter.py 1.4.24.1 => 1.4.24.2 ===
--- ZODB3/BDBStorage/tests/timeiter.py:1.4.24.1 Tue Jul 1 15:34:08 2003
+++ ZODB3/BDBStorage/tests/timeiter.py Tue Jul 1 16:57:01 2003
@@ -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
=== ZODB3/BDBStorage/tests/timepickles.py 1.3.24.1 => 1.3.24.2 ===
--- ZODB3/BDBStorage/tests/timepickles.py:1.3.24.1 Tue Jul 1 15:34:08 2003
+++ ZODB3/BDBStorage/tests/timepickles.py Tue Jul 1 16:57:01 2003
@@ -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