[Zope3-checkins] CVS: Zope3/src/zodb/zeo/tests - threadtests.py:1.4.2.1 test_zeo.py:1.7.2.1 connection.py:1.5.2.1 commitlock.py:1.3.2.1

[Jeremy Hylton]

Update of /cvs-repository/Zope3/src/zodb/zeo/tests
In directory cvs.zope.org:/tmp/cvs-serv19735/zeo/tests

Modified Files:
      Tag: ZODB3-2-integration-branch
	threadtests.py test_zeo.py connection.py commitlock.py 
Log Message:
Merge more of ZODB3.2 into Zope3.

The big changes here are:
Move errors into interfaces and cleanup inheritance relationships.
Add new cache verification code to the client, including internal _ready.


=== Zope3/src/zodb/zeo/tests/threadtests.py 1.4 => 1.4.2.1 ===
--- Zope3/src/zodb/zeo/tests/threadtests.py:1.4	Wed Feb  5 18:28:22 2003
+++ Zope3/src/zodb/zeo/tests/threadtests.py	Mon Feb 10 17:08:29 2003
@@ -19,7 +19,7 @@
 from zodb.storage.tests.base import zodb_pickle, MinPO
 
 from zodb.zeo.client import ClientStorageError
-from zodb.zeo.interfaces import Disconnected
+from zodb.zeo.interfaces import ClientDisconnected
 
 ZERO = '\0'*8
 
@@ -86,7 +86,7 @@
             self.gotValueError = 1
         try:
             self.storage.tpcAbort(self.trans)
-        except Disconnected:
+        except ClientDisconnected:
             self.gotDisconnected = 1
 
 class MTStoresThread(threading.Thread):


=== Zope3/src/zodb/zeo/tests/test_zeo.py 1.7 => 1.7.2.1 ===
--- Zope3/src/zodb/zeo/tests/test_zeo.py:1.7	Wed Feb  5 18:28:22 2003
+++ Zope3/src/zodb/zeo/tests/test_zeo.py	Mon Feb 10 17:08:29 2003
@@ -37,7 +37,6 @@
 
 # ZEO imports
 from zodb.zeo.client import ClientStorage
-from zodb.zeo.interfaces import Disconnected
 
 # ZEO test support
 from zodb.zeo.tests import forker, cache
@@ -59,7 +58,7 @@
 
     def checkZEOInvalidation(self):
         addr = self._storage._addr
-        storage2 = ClientStorage(addr, wait=1, min_disconnect_poll=0.1)
+        storage2 = ClientStorage(addr, wait=True, min_disconnect_poll=0.1)
         try:
             oid = self._storage.newObjectId()
             ob = MinPO('first')


=== Zope3/src/zodb/zeo/tests/connection.py 1.5 => 1.5.2.1 ===
--- Zope3/src/zodb/zeo/tests/connection.py:1.5	Wed Feb  5 18:28:22 2003
+++ Zope3/src/zodb/zeo/tests/connection.py	Mon Feb 10 17:08:29 2003
@@ -24,7 +24,7 @@
 import logging
 
 from zodb.zeo.client import ClientStorage
-from zodb.zeo.interfaces import Disconnected
+from zodb.zeo.interfaces import ClientDisconnected
 from zodb.zeo.zrpc.marshal import Marshaller
 from zodb.zeo.tests import forker
 


=== Zope3/src/zodb/zeo/tests/commitlock.py 1.3 => 1.3.2.1 ===
--- Zope3/src/zodb/zeo/tests/commitlock.py:1.3	Wed Feb  5 18:28:22 2003
+++ Zope3/src/zodb/zeo/tests/commitlock.py	Mon Feb 10 17:08:29 2003
@@ -21,7 +21,7 @@
 from zodb.storage.tests.base import zodb_pickle, MinPO
 
 from zodb.zeo.client import ClientStorage
-from zodb.zeo.interfaces import Disconnected
+from zodb.zeo.interfaces import ClientDisconnected
 
 ZERO = '\0'*8
 
@@ -80,7 +80,7 @@
                 self.storage.tpcFinish(self.trans)
             else:
                 self.storage.tpcAbort(self.trans)
-        except Disconnected:
+        except ClientDisconnected:
             pass
 
 class CommitLockTests: