[Zope-Checkins] CVS: ZODB3/ZEO/tests - CommitLockTests.py:1.12.20.2 ConnectionTests.py:1.40.6.1 InvalidationTests.py:1.4.6.1 auth_plaintext.py:1.2.8.1 forker.py:1.37.8.2 testAuth.py:1.3.8.1 testMonitor.py:1.6.8.1 zeoserver.py:1.19.8.1
Tim Peters
tim.one@comcast.net
Tue, 1 Jul 2003 16:57:44 -0400
Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv9924/ZEO/tests
Modified Files:
Tag: zodb33-devel-branch
CommitLockTests.py ConnectionTests.py InvalidationTests.py
auth_plaintext.py forker.py testAuth.py testMonitor.py
zeoserver.py
Log Message:
Whitespace normalization.
=== ZODB3/ZEO/tests/CommitLockTests.py 1.12.20.1 => 1.12.20.2 ===
--- ZODB3/ZEO/tests/CommitLockTests.py:1.12.20.1 Tue Jul 1 15:34:09 2003
+++ ZODB3/ZEO/tests/CommitLockTests.py Tue Jul 1 16:57:11 2003
@@ -117,7 +117,7 @@
self._dostore()
self._cleanup()
-
+
def checkCommitLockVoteAbort(self):
oid, txn = self._start_txn()
self._storage.tpc_vote(txn)
@@ -130,7 +130,7 @@
self._dostore()
self._cleanup()
-
+
def checkCommitLockVoteClose(self):
oid, txn = self._start_txn()
self._storage.tpc_vote(txn)
@@ -154,7 +154,7 @@
def _finish_undo(self, msgid):
return self._storage._server.rpc._deferred_wait(msgid)
-
+
def checkCommitLockUndoFinish(self):
trans_id = self._get_trans_id()
oid, txn = self._start_txn()
@@ -171,7 +171,7 @@
self._dostore()
self._cleanup()
-
+
def checkCommitLockUndoAbort(self):
trans_id = self._get_trans_id()
oid, txn = self._start_txn()
@@ -187,7 +187,7 @@
self._dostore()
self._cleanup()
-
+
def checkCommitLockUndoClose(self):
trans_id = self._get_trans_id()
oid, txn = self._start_txn()
@@ -202,23 +202,23 @@
self._finish_threads()
self._cleanup()
-
+
def _begin_threads(self):
# Start a second transaction on a different connection without
# blocking the test thread.
self._storages = []
self._threads = []
-
+
for i in range(self.NUM_CLIENTS):
storage = self._duplicate_client()
txn = Transaction()
tid = self._get_timestamp()
-
+
t = WorkerThread(self, storage, txn)
self._threads.append(t)
t.start()
t.ready.wait()
-
+
# Close on the connections abnormally to test server response
if i == 0:
storage.close()
=== ZODB3/ZEO/tests/ConnectionTests.py 1.40 => 1.40.6.1 ===
--- ZODB3/ZEO/tests/ConnectionTests.py:1.40 Mon Jun 16 17:04:38 2003
+++ ZODB3/ZEO/tests/ConnectionTests.py Tue Jul 1 16:57:12 2003
@@ -161,7 +161,7 @@
if ro_svr:
zconf.read_only = 1
if self.monitor:
- zconf.monitor_address = ("", 42000)
+ zconf.monitor_address = ("", 42000)
if self.invq:
zconf.invalidation_queue_size = self.invq
if self.timeout:
=== ZODB3/ZEO/tests/InvalidationTests.py 1.4 => 1.4.6.1 ===
--- ZODB3/ZEO/tests/InvalidationTests.py:1.4 Fri Jun 13 19:09:30 2003
+++ ZODB3/ZEO/tests/InvalidationTests.py Tue Jul 1 16:57:12 2003
@@ -315,4 +315,3 @@
cn.close()
db1.close()
db2.close()
-
=== ZODB3/ZEO/tests/auth_plaintext.py 1.2 => 1.2.8.1 ===
--- ZODB3/ZEO/tests/auth_plaintext.py:1.2 Fri May 30 15:20:56 2003
+++ ZODB3/ZEO/tests/auth_plaintext.py Tue Jul 1 16:57:12 2003
@@ -13,8 +13,8 @@
##############################################################################
"""Implements plaintext password authentication. The password is stored in
an SHA hash in the Database. The client sends over the plaintext
-password, and the SHA hashing is done on the server side.
-
+password, and the SHA hashing is done on the server side.
+
This mechanism offers *no network security at all*; the only security
is provided by not storing plaintext passwords on disk. (See the
auth_srp module for a secure mechanism)"""
@@ -31,10 +31,10 @@
dbpw = self.database.get_password(username)
except LookupError:
return 0
-
+
password = sha.new(password).hexdigest()
return self.finish_auth(dbpw == password)
-
+
class PlaintextClient(Client):
extensions = ["auth"]
=== ZODB3/ZEO/tests/forker.py 1.37.8.1 => 1.37.8.2 ===
--- ZODB3/ZEO/tests/forker.py:1.37.8.1 Tue Jul 1 15:34:09 2003
+++ ZODB3/ZEO/tests/forker.py Tue Jul 1 16:57:12 2003
@@ -70,20 +70,20 @@
Returns the ZEO port, the test server port, the pid, and the path
to the config file.
"""
-
+
# Store the config info in a temp file.
tmpfile = tempfile.mktemp(".conf")
fp = open(tmpfile, 'w')
zeo_conf.dump(fp)
fp.write(storage_conf)
fp.close()
-
+
# Find the zeoserver script
import ZEO.tests.zeoserver
script = ZEO.tests.zeoserver.__file__
if script.endswith('.pyc'):
script = script[:-1]
-
+
# Create a list of arguments, which we'll tuplify below
qa = _quote_arg
args = [qa(sys.executable), qa(script), '-C', qa(tmpfile)]
=== ZODB3/ZEO/tests/testAuth.py 1.3 => 1.3.8.1 ===
--- ZODB3/ZEO/tests/testAuth.py:1.3 Fri May 30 15:20:56 2003
+++ ZODB3/ZEO/tests/testAuth.py Tue Jul 1 16:57:12 2003
@@ -30,7 +30,7 @@
__super_getServerConfig = CommonSetupTearDown.getServerConfig
__super_setUp = CommonSetupTearDown.setUp
__super_tearDown = CommonSetupTearDown.tearDown
-
+
realm = None
def setUp(self):
@@ -74,7 +74,7 @@
self.assert_(self._storage._connection)
self._storage._connection.poll()
self.assert_(self._storage.is_connected())
-
+
def testNOK(self):
self._storage = self.openClientStorage(wait=0, username="foo",
password="noogie",
@@ -108,4 +108,3 @@
if __name__ == "__main__":
unittest.main(defaultTest='test_suite')
-
=== ZODB3/ZEO/tests/testMonitor.py 1.6 => 1.6.8.1 ===
--- ZODB3/ZEO/tests/testMonitor.py:1.6 Fri May 30 15:20:56 2003
+++ ZODB3/ZEO/tests/testMonitor.py Tue Jul 1 16:57:12 2003
@@ -70,7 +70,7 @@
s.parse("\n".join(sect[1:]))
return d
-
+
def getConfig(self, path, create, read_only):
return """<mappingstorage 1/>"""
=== ZODB3/ZEO/tests/zeoserver.py 1.19 => 1.19.8.1 ===
--- ZODB3/ZEO/tests/zeoserver.py:1.19 Thu Jun 5 18:39:01 2003
+++ ZODB3/ZEO/tests/zeoserver.py Tue Jul 1 16:57:12 2003
@@ -134,7 +134,7 @@
def main():
label = 'zeoserver:%d' % os.getpid()
log(label, 'starting')
-
+
# We don't do much sanity checking of the arguments, since if we get it
# wrong, it's a bug in the test suite.
keep = 0
@@ -150,11 +150,11 @@
zo = ZEOOptions()
zo.realize(["-C", configfile])
zeo_port = int(zo.address[1])
-
+
# XXX a hack
if zo.auth_protocol == "plaintext":
import ZEO.tests.auth_plaintext
-
+
# Open the config file and let ZConfig parse the data there. Then remove
# the config file, otherwise we'll leave turds.
# The rest of the args are hostname, portnum
@@ -186,7 +186,7 @@
storage.close()
cleanup(storage)
sys.exit(2)
-
+
t.register_socket(server.dispatcher)
# Create daemon suicide thread
d = Suicide(test_addr)