[Zodb-checkins] CVS: ZEO/ZEO/tests - Cache.py:1.4.4.3 forker.py:1.10.4.5 speed.py:1.5.4.2 testTransactionBuffer.py:1.3.2.2 testZEO.py:1.16.4.7
Tim Peters
tim.one@home.com
Sat, 26 Jan 2002 13:03:52 -0500
Update of /cvs-repository/ZEO/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv28311/tests
Modified Files:
Tag: Standby-branch
Cache.py forker.py speed.py testTransactionBuffer.py
testZEO.py
Log Message:
Whitespace normalization.
=== ZEO/ZEO/tests/Cache.py 1.4.4.2 => 1.4.4.3 ===
# 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)
=== ZEO/ZEO/tests/forker.py 1.10.4.4 => 1.10.4.5 ===
wait_for_server_on_startup=1)
return s, exit, pid
-
=== ZEO/ZEO/tests/speed.py 1.5.4.1 => 1.5.4.2 ===
"""
-import asyncore
+import asyncore
import sys, os, getopt, string, time
##sys.path.insert(0, os.getcwd())
@@ -77,7 +77,7 @@
for r in 1, 10, 100, 1000:
t = time.time()
conflicts = 0
-
+
jar = db.open()
while 1:
try:
@@ -101,7 +101,7 @@
else:
break
jar.close()
-
+
t = time.time() - t
if detailed:
if threadno is None:
@@ -201,11 +201,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:])
=== ZEO/ZEO/tests/testTransactionBuffer.py 1.3.2.1 => 1.3.2.2 ===
x = x[:2]
self.assertEqual(x, data[i])
-
+
def checkOrderPreserved(self):
tbuf = TransactionBuffer()
self.doUpdates(tbuf)
@@ -61,4 +61,3 @@
def test_suite():
return unittest.makeSuite(TransBufTests, 'check')
-
=== ZEO/ZEO/tests/testZEO.py 1.16.4.6 => 1.16.4.7 ===
class ZEOFileStorageTests(GenericTests):
__super_setUp = GenericTests.setUp
-
+
def setUp(self):
self.__fs_base = tempfile.mktemp()
self.__super_setUp()
@@ -108,7 +108,7 @@
def open(self, read_only=0):
# XXX Needed to support ReadOnlyStorage tests. Ought to be a
# cleaner way.
-
+
# Is this the only way to get the address?
addr = self._storage._rpc_mgr.addr[0][1]
self._storage.close()
@@ -134,7 +134,7 @@
can't be created in the parent process and passed to the child.
All the work has to be done in the server's process.
"""
-
+
def setUp(self):
args = self.getStorageInfo()
name = args[0]
@@ -176,7 +176,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 = []
@@ -221,14 +221,14 @@
def checkMultipleServers(self):
# XXX crude test at first -- just start two servers and do a
# commit at each one.
-
+
self._newAddr()
self._storage = self.openClientStorage('test', 100000, wait=1)
self._dostore()
self.shutdownServer(index=0)
self._startServer(index=1)
-
+
# If we can still store after shutting down one of the
# servers, we must be reconnecting to the other server.
@@ -238,7 +238,7 @@
break
except Disconnected:
time.sleep(0.5)
-
+
def checkDisconnectionError(self):
# Make sure we get a Disconnected when we try to read an
@@ -271,7 +271,7 @@
# In this case, only one object fits in a cache file. When the
# cache files swap, the first object is effectively uncached.
-
+
self._storage = self.openClientStorage('test', 1000, wait=1)
oid1 = self._storage.new_oid()
obj1 = MinPO("1" * 500)
@@ -316,7 +316,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):
@@ -453,7 +453,7 @@
if args:
print "Did not expect arguments. Got %s" % args
return 0
-
+
tests = makeTestSuite(name_of_test)
runner = unittest.TextTestRunner()
runner.run(tests)