Merge branch 'master' into python38-and-39

src/ZEO/tests/drop_cache_rather_than_verify.txt

@@ -59,7 +59,7 @@ logging and event data:
     >>> def event_handler(e):
     ...   if hasattr(e, 'storage'):
     ...     events.append((
-    ...       len(e.storage._server.client.cache), str(handler), e.__class__.__name__))
+    ...       len(e.storage._cache), str(handler), e.__class__.__name__))
 
     >>> old_notify = ZODB.event.notify
     >>> ZODB.event.notify = event_handler
@@ -75,10 +75,6 @@ Now, we'll restart the server on the original address:
 
     >>> wait_connected(db.storage)
 
-##### debugging only ########
-    >>> print(db.storage._server.client.verify_result)
-    cache too old, clearing
-
 Now, let's verify our assertions above:
 
 - Publishes a stale-cache event.
@@ -145,10 +141,6 @@ another client:
 (When a database is created, it checks to make sure the root object is
 in the database, which is why we get 1, rather than 0 objects in the cache.)
 
-##### debugging only ########
-    >>> print(db.storage._server.client.verify_result)
-    cache too old, clearing
-
 - Publishes a stale-cache event.
 
     >>> for e in events: