[Zodb-checkins] SVN: ZODB/trunk/src/ZEO/ Made the interaction of ClientStorage.verify_cache and connection

[Jim Fulton]

Log message for revision 93994:
  Made the interaction of ClientStorage.verify_cache and connection
  tests more precise to aid test debugging.
  

Changed:
  U   ZODB/trunk/src/ZEO/ClientStorage.py
  U   ZODB/trunk/src/ZEO/tests/ConnectionTests.py

-=-
Modified: ZODB/trunk/src/ZEO/ClientStorage.py
===================================================================
--- ZODB/trunk/src/ZEO/ClientStorage.py	2008-12-12 17:23:53 UTC (rev 93993)
+++ ZODB/trunk/src/ZEO/ClientStorage.py	2008-12-12 17:23:55 UTC (rev 93994)
@@ -1316,7 +1316,7 @@
             if ltid and ltid != utils.z64:
                 self._cache.setLastTid(ltid)
             self.finish_verification()
-            return "full verification"
+            return "empty cache"
 
         last_inval_tid = self._cache.getLastTid()
         if last_inval_tid is not None:

Modified: ZODB/trunk/src/ZEO/tests/ConnectionTests.py
===================================================================
--- ZODB/trunk/src/ZEO/tests/ConnectionTests.py	2008-12-12 17:23:53 UTC (rev 93993)
+++ ZODB/trunk/src/ZEO/tests/ConnectionTests.py	2008-12-12 17:23:55 UTC (rev 93994)
@@ -593,14 +593,14 @@
 
     def checkQuickVerificationWith2Clients(self):
         perstorage = self.openClientStorage(cache="test")
-        self.assertEqual(perstorage.verify_result, "full verification")
+        self.assertEqual(perstorage.verify_result, "empty cache")
 
         self._storage = self.openClientStorage()
         oid = self._storage.new_oid()
         oid2 = self._storage.new_oid()
         # When we create a new storage, it should always do a full
         # verification
-        self.assertEqual(self._storage.verify_result, "full verification")
+        self.assertEqual(self._storage.verify_result, "empty cache")
         # do two storages of the object to make sure an invalidation
         # message is generated
         revid = self._dostore(oid)
@@ -628,13 +628,13 @@
 
     def checkVerificationWith2ClientsInvqOverflow(self):
         perstorage = self.openClientStorage(cache="test")
-        self.assertEqual(perstorage.verify_result, "full verification")
+        self.assertEqual(perstorage.verify_result, "empty cache")
 
         self._storage = self.openClientStorage()
         oid = self._storage.new_oid()
         # When we create a new storage, it should always do a full
         # verification
-        self.assertEqual(self._storage.verify_result, "full verification")
+        self.assertEqual(self._storage.verify_result, "empty cache")
         # do two storages of the object to make sure an invalidation
         # message is generated
         revid = self._dostore(oid)
@@ -836,7 +836,7 @@
         self._storage = self.openClientStorage()
         # When we create a new storage, it should always do a full
         # verification
-        self.assertEqual(self._storage.verify_result, "full verification")
+        self.assertEqual(self._storage.verify_result, "empty cache")
         self._dostore()
         self.shutdownServer()
         self.pollDown()
@@ -849,13 +849,13 @@
 
     def checkNoVerificationOnServerRestartWith2Clients(self):
         perstorage = self.openClientStorage(cache="test")
-        self.assertEqual(perstorage.verify_result, "full verification")
+        self.assertEqual(perstorage.verify_result, "empty cache")
 
         self._storage = self.openClientStorage()
         oid = self._storage.new_oid()
         # When we create a new storage, it should always do a full
         # verification
-        self.assertEqual(self._storage.verify_result, "full verification")
+        self.assertEqual(self._storage.verify_result, "empty cache")
         # do two storages of the object to make sure an invalidation
         # message is generated
         revid = self._dostore(oid)