[Zodb-checkins] CVS: ZODB3/ZEO/tests - Cache.py:1.9 CommitLockTests.py:1.8 TestThread.py:1.3 ThreadTests.py:1.4 __init__.py:1.4 forker.py:1.17 multi.py:1.9 speed.py:1.8 stress.py:1.7 testClientCache.py:1.5 testStart.py:1.10 testTransactionBuffer.py:1.5 testZEO.py:1.31 winserver.py:1.5
Guido van Rossum
guido@python.org
Thu, 29 Aug 2002 12:32:53 -0400
Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv16645
Modified Files:
Cache.py CommitLockTests.py TestThread.py ThreadTests.py
__init__.py forker.py multi.py speed.py stress.py
testClientCache.py testStart.py testTransactionBuffer.py
testZEO.py winserver.py
Log Message:
Whitespace cleanup.
=== ZODB3/ZEO/tests/Cache.py 1.8 => 1.9 ===
--- ZODB3/ZEO/tests/Cache.py:1.8 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/Cache.py Thu Aug 29 12:32:51 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 of the ZEO cache"""
=== ZODB3/ZEO/tests/CommitLockTests.py 1.7 => 1.8 ===
--- ZODB3/ZEO/tests/CommitLockTests.py:1.7 Mon Aug 12 14:24:13 2002
+++ ZODB3/ZEO/tests/CommitLockTests.py Thu Aug 29 12:32:51 2002
@@ -194,4 +194,3 @@
t = time.time()
t = apply(TimeStamp,(time.gmtime(t)[:5]+(t%60,)))
return `t`
-
=== ZODB3/ZEO/tests/TestThread.py 1.2 => 1.3 ===
--- ZODB3/ZEO/tests/TestThread.py:1.2 Fri Aug 9 16:31:45 2002
+++ ZODB3/ZEO/tests/TestThread.py Thu Aug 29 12:32:51 2002
@@ -40,4 +40,3 @@
self.join(timeout)
if self.isAlive():
self._testcase.fail("Thread did not finish: %s" % self)
-
=== ZODB3/ZEO/tests/ThreadTests.py 1.3 => 1.4 ===
--- ZODB3/ZEO/tests/ThreadTests.py:1.3 Tue Aug 6 12:35:34 2002
+++ ZODB3/ZEO/tests/ThreadTests.py Thu Aug 29 12:32:51 2002
@@ -2,14 +2,14 @@
#
# Copyright (c) 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
-#
+#
##############################################################################
"""Compromising positions involving threads."""
=== ZODB3/ZEO/tests/__init__.py 1.3 => 1.4 ===
--- ZODB3/ZEO/tests/__init__.py:1.3 Fri Mar 15 00:11:54 2002
+++ ZODB3/ZEO/tests/__init__.py Thu Aug 29 12:32:51 2002
@@ -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/ZEO/tests/forker.py 1.16 => 1.17 ===
--- ZODB3/ZEO/tests/forker.py:1.16 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/forker.py Thu Aug 29 12:32:51 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
-#
+#
##############################################################################
"""Library for forking storage server and connecting client storage"""
=== ZODB3/ZEO/tests/multi.py 1.8 => 1.9 ===
--- ZODB3/ZEO/tests/multi.py:1.8 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/multi.py Thu Aug 29 12:32:51 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 multi-client test of the ZEO storage server"""
=== ZODB3/ZEO/tests/speed.py 1.7 => 1.8 ===
--- ZODB3/ZEO/tests/speed.py:1.7 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/speed.py Thu Aug 29 12:32:51 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
=== ZODB3/ZEO/tests/stress.py 1.6 => 1.7 ===
--- ZODB3/ZEO/tests/stress.py:1.6 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/stress.py Thu Aug 29 12:32:51 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 ZEO client-server stress test to look for leaks.
=== ZODB3/ZEO/tests/testClientCache.py 1.4 => 1.5 ===
--- ZODB3/ZEO/tests/testClientCache.py:1.4 Tue Aug 27 18:42:56 2002
+++ ZODB3/ZEO/tests/testClientCache.py Thu Aug 29 12:32:51 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 suite for the ZEO.ClientCache module.
=== ZODB3/ZEO/tests/testStart.py 1.9 => 1.10 ===
--- ZODB3/ZEO/tests/testStart.py:1.9 Fri Aug 23 10:31:44 2002
+++ ZODB3/ZEO/tests/testStart.py Thu Aug 29 12:32:51 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 os
@@ -29,7 +29,7 @@
except ImportError:
# for compatibility with Zope 2.5 &c.
import errno
-
+
def removefs(base):
"""Remove all files created by FileStorage with path base."""
for ext in '', '.old', '.tmp', '.lock', '.index', '.pack':
@@ -144,7 +144,7 @@
def testNoPort(self):
outp = self.system("-s")
self.assert_(outp.find("No port specified") != -1)
-
+
def testStart(self):
port = 9090
outp = self.fork("-s", "-p", str(port))
@@ -187,11 +187,10 @@
os.unlink(logfile2)
except os.error:
pass
-
+
def test_suite():
if os.name == "posix":
return unittest.makeSuite(StartTests)
else:
# Don't even bother with these tests on Windows
return None
-
=== ZODB3/ZEO/tests/testTransactionBuffer.py 1.4 => 1.5 ===
--- ZODB3/ZEO/tests/testTransactionBuffer.py:1.4 Tue Jun 11 09:43:06 2002
+++ ZODB3/ZEO/tests/testTransactionBuffer.py Thu Aug 29 12:32:51 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 unittest
=== ZODB3/ZEO/tests/testZEO.py 1.30 => 1.31 ===
--- ZODB3/ZEO/tests/testZEO.py:1.30 Wed Aug 28 12:37:09 2002
+++ ZODB3/ZEO/tests/testZEO.py Thu Aug 29 12:32:51 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 suite for ZEO based on ZODB.tests"""
@@ -36,7 +36,7 @@
except ImportError:
# for compatibility with Zope 2.5 &c.
import errno
-
+
def removefs(base):
"""Remove all files created by FileStorage with path base."""
for ext in '', '.old', '.tmp', '.lock', '.index', '.pack':
@@ -114,11 +114,11 @@
for pid in self._pids:
os.waitpid(pid, 0)
self.delStorage()
-
+
def open(self, read_only=0):
# XXX Needed to support ReadOnlyStorage tests. Ought to be a
# cleaner way.
-
+
addr = self._storage._addr
self._storage.close()
self._storage = ZEO.ClientStorage.ClientStorage(addr,
@@ -390,7 +390,7 @@
zLOG.LOG("checkReconnection", zLOG.INFO, "finished")
class UnixConnectionTests(ConnectionTests):
-
+
def _startServer(self, create=1, index=0):
path = "%s.%d" % (self.file, index)
addr = self.addr[index]
@@ -409,7 +409,7 @@
pass
class WindowsConnectionTests(ConnectionTests):
-
+
def _startServer(self, create=1, index=0):
path = "%s.%d" % (self.file, index)
addr = self.addr[index]
=== ZODB3/ZEO/tests/winserver.py 1.4 => 1.5 ===
--- ZODB3/ZEO/tests/winserver.py:1.4 Fri Mar 15 00:11:54 2002
+++ ZODB3/ZEO/tests/winserver.py Thu Aug 29 12:32:51 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
-#
+#
##############################################################################
"""Helper file used to launch ZEO server for Windows tests"""