[Zodb-checkins] CVS: ZODB3/ZEO/tests - testZEO.py:1.30

[Guido van Rossum]

Update of /cvs-repository/ZODB3/ZEO/tests
In directory cvs.zope.org:/tmp/cvs-serv32642/tests

Modified Files:
	testZEO.py 
Log Message:
Another bunch of small cleanups and fixes.

Open the cache later to avoid scanning it twice if a connection is
made right away.

ClientStorage.close() is now idempotent.

ClientStorage stores its addr argument as self._addr so the test suite
doesn't have to dig it out of the rpc manager to reopen the storage as
readonly.

Renamed some of the callbacks into the client for clarity:
begin -> beginVerify
end -> endVerify
invalidate -> invalidateVerify
Invalidate -> invalidateTrans


=== ZODB3/ZEO/tests/testZEO.py 1.29 => 1.30 ===
--- ZODB3/ZEO/tests/testZEO.py:1.29	Thu Aug 22 15:14:21 2002
+++ ZODB3/ZEO/tests/testZEO.py	Wed Aug 28 12:37:09 2002
@@ -119,10 +119,10 @@
         # 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]
+        addr = self._storage._addr
         self._storage.close()
-        self._storage = ZEO.ClientStorage.ClientStorage(addr, read_only=1,
+        self._storage = ZEO.ClientStorage.ClientStorage(addr,
+                                                        read_only=read_only,
                                                         wait=1)
 
     def checkLargeUpdate(self):
@@ -130,7 +130,7 @@
         self._dostore(data=obj)
 
     def checkZEOInvalidation(self):
-        addr = self._storage._rpc_mgr.addr[0][1]
+        addr = self._storage._addr
         storage2 = ZEO.ClientStorage.ClientStorage(addr, wait=1,
                                                    min_disconnect_poll=0.1)
         try: