Merge master.

.gitignore

@@ -5,6 +5,5 @@ __pycache__
 .tox
 bin
 develop-eggs
-docs
-parts
 eggs
+parts

src/ZEO/tests/testZEO.py

@@ -1153,22 +1153,14 @@ def client_has_newer_data_than_server():
     ...           time.sleep(.01)
 
     >>> db.close()
-    >>> for record in handler.records[:5]:
-    ...     print(formatter.format(record))
-    ... # doctest: +ELLIPSIS +NORMALIZE_WHITESPACE
-    ZEO.ClientStorage CRITICAL client
-    Client has seen newer transactions than server!
-    ZEO.zrpc ERROR (...) CW: error in notifyConnected (('127.0.0.1', ...))
-    Traceback (most recent call last):
-    ...
-    ClientStorageError: client Client has seen newer transactions than server!
-    ZEO.ClientStorage CRITICAL client
-    Client has seen newer transactions than server!
-    ZEO.zrpc ERROR (...) CW: error in notifyConnected (('127.0.0.1', ...))
-    Traceback (most recent call last):
-    ...
-    ClientStorageError: client Client has seen newer transactions than server!
-    ...
+    >>> client_errors = [x for x in handler.records
+    ...                   if x.filename == 'ClientStorage.py' and
+    ...                      x.funcName == 'verify_cache' and
+    ...                      x.levelname == 'CRITICAL' and
+    ...                      x.msg == 'client Client has seen '
+    ...                               'newer transactions than server!']
+    >>> len(client_errors) >= 2
+    True
 
     Note that the errors repeat because the client keeps on trying to connect.
 

src/ZEO/tests/zeo-fan-out.test

@@ -116,6 +116,7 @@ invalidated:
     >>> stop_server(adminaddr0)
     >>> _ = start_server('<filestorage 1>\npath fs\n</filestorage>\n',
     ...                  port=port0)
+    >>> time.sleep(10) # get past startup / verification 
 
     >>> for i in range(1000):
     ...     c1.sync()