[Zodb-checkins] CVS: ZODB3/ZEO1/tests - Cache.py:1.1.1.1.30.1
__init__.py:1.1.1.1.30.1 forker.py:1.1.1.1.30.1
multi.py:1.1.1.1.30.1 speed.py:1.1.1.1.30.1
stress.py:1.1.1.1.30.1 testClientCache.py:1.1.30.1
testZEO.py:1.1.1.1.30.1 winserver.py:1.1.1.1.30.1
Tim Peters
tim.one at comcast.net
Mon Sep 15 17:27:27 EDT 2003
Update of /cvs-repository/ZODB3/ZEO1/tests
In directory cvs.zope.org:/tmp/cvs-serv17778/ZEO1/tests
Modified Files:
Tag: Zope-2_7-branch
Cache.py __init__.py forker.py multi.py speed.py stress.py
testClientCache.py testZEO.py winserver.py
Log Message:
Whitespace normalization (via Python's reindent.py script).
=== ZODB3/ZEO1/tests/Cache.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/Cache.py:1.1.1.1 Mon Aug 12 16:39:59 2002
+++ ZODB3/ZEO1/tests/Cache.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
"""Tests of the ZEO cache"""
@@ -46,7 +46,7 @@
# Make sure this doesn't load invalid data into the cache
self._storage.load(oid, '')
-
+
self._storage.tpc_vote(t)
self._storage.tpc_finish(t)
=== ZODB3/ZEO1/tests/__init__.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/__init__.py:1.1.1.1 Mon Aug 12 16:39:59 2002
+++ ZODB3/ZEO1/tests/__init__.py Mon Sep 15 17:26:55 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/ZEO1/tests/forker.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/forker.py:1.1.1.1 Mon Aug 12 16:40:00 2002
+++ ZODB3/ZEO1/tests/forker.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
"""Library for forking storage server and connecting client storage"""
@@ -143,4 +143,3 @@
cache_size=cache_size,
min_disconnect_poll=0.5)
return s, exit, pid
-
=== ZODB3/ZEO1/tests/multi.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/multi.py:1.1.1.1 Mon Aug 12 16:40:00 2002
+++ ZODB3/ZEO1/tests/multi.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
"""A multi-client test of the ZEO storage server"""
=== ZODB3/ZEO1/tests/speed.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/speed.py:1.1.1.1 Mon Aug 12 16:40:00 2002
+++ ZODB3/ZEO1/tests/speed.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
usage="""Test speed of a ZODB storage
@@ -41,7 +41,7 @@
-t n Number of concurrent threads to run.
"""
-import asyncore
+import asyncore
import sys, os, getopt, string, time
##sys.path.insert(0, os.getcwd())
@@ -81,7 +81,7 @@
for r in 1, 10, 100, 1000:
t = time.time()
conflicts = 0
-
+
jar = db.open()
while 1:
try:
@@ -105,7 +105,7 @@
else:
break
jar.close()
-
+
t = time.time() - t
if detailed:
if threadno is None:
@@ -205,11 +205,11 @@
for v in l:
tot = tot + v
return tot / len(l)
-
+
##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:])
=== ZODB3/ZEO1/tests/stress.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/stress.py:1.1.1.1 Mon Aug 12 16:40:01 2002
+++ ZODB3/ZEO1/tests/stress.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
"""A ZEO client-server stress test to look for leaks.
@@ -103,7 +103,7 @@
pid = os.fork()
if pid != 0:
return pid
-
+
storage = ClientStorage(zaddr, debug=1, min_disconnect_poll=0.5)
db = ZODB.DB(storage, pool_size=NUM_CONNECTIONS)
setup(db.open())
=== ZODB3/ZEO1/tests/testClientCache.py 1.1 => 1.1.30.1 ===
--- ZODB3/ZEO1/tests/testClientCache.py:1.1 Wed Aug 28 18:07:21 2002
+++ ZODB3/ZEO1/tests/testClientCache.py Mon Sep 15 17:26:55 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 suite for the ZEO.ClientCache module.
=== ZODB3/ZEO1/tests/testZEO.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/testZEO.py:1.1.1.1 Mon Aug 12 16:40:02 2002
+++ ZODB3/ZEO1/tests/testZEO.py Mon Sep 15 17:26:55 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 suite for ZEO based on ZODB.tests"""
@@ -58,12 +58,12 @@
class ZEOTestBase(StorageTestBase.StorageTestBase):
"""Version of the storage test class that supports ZEO.
-
+
For ZEO, we don't always get the serialno/exception for a
particular store as the return value from the store. But we
will get no later than the return value from vote.
"""
-
+
def _dostore(self, oid=None, revid=None, data=None, version=None,
already_pickled=0):
"""Do a complete storage transaction.
@@ -73,7 +73,7 @@
- revid=None, use a revid of ZERO
- data=None, pickle up some arbitrary data (the integer 7)
- version=None, use the empty string version
-
+
Returns the object's new revision id.
"""
if oid is None:
@@ -130,7 +130,7 @@
else:
class VersionDependentTests:
pass
-
+
class GenericTests(ZEOTestBase,
VersionDependentTests,
Cache.StorageWithCache,
@@ -237,7 +237,7 @@
class ZEOFileStorageTests(GenericTests):
__super_setUp = GenericTests.setUp
-
+
def setUp(self):
self.__fs_base = tempfile.mktemp()
self.__super_setUp()
@@ -308,7 +308,7 @@
To test the cache or re-connection, these test cases explicit
start and stop a ZEO storage server.
"""
-
+
__super_tearDown = StorageTestBase.StorageTestBase.tearDown
ports = []
@@ -400,7 +400,7 @@
# on users to catch a plethora of exceptions in order to
# write robust code. Need to think about implementing
# John Heintz's suggestion to make sure all exceptions
- # inherit from POSException.
+ # inherit from POSException.
class UnixConnectionTests(ConnectionTests):
__super_setUp = StorageTestBase.StorageTestBase.setUp
@@ -522,7 +522,7 @@
if args:
print "Did not expect arguments. Got %s" % args
return 0
-
+
tests = makeTestSuite(name_of_test)
runner = unittest.TextTestRunner()
runner.run(tests)
=== ZODB3/ZEO1/tests/winserver.py 1.1.1.1 => 1.1.1.1.30.1 ===
--- ZODB3/ZEO1/tests/winserver.py:1.1.1.1 Mon Aug 12 16:40:02 2002
+++ ZODB3/ZEO1/tests/winserver.py Mon Sep 15 17:26:55 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
-#
+#
##############################################################################
"""Helper file used to launch ZEO server for Windows tests"""
More information about the Zodb-checkins
mailing list