lib/zodb: Drop client-only parameters from normalized NEO URI

We need to drop client-specific options so that NEO URI that only differ
due to client options while actually pointing to the same NEO server
are equal after normalization.

lib/tests/test_zodb.py

@@ -560,6 +560,8 @@ def test_zstor_2zurl(tmpdir, neo_ssl_dict):
         ("neos://cluster@xyz:1?ca=α&key=β&cert=γ", "neos://cluster@xyz:1"),
         #   neo:// with anything SSL-related in query -> neos://
         ("neo://cluster@xyz:1?cert=c", "neos://cluster@xyz:1"),
+        #   client options
+        ("neo://cluster@xyz:1?compress=1&read-only=true&logfile=abc.log&cache-size=1024", "neo://cluster@xyz:1"),
     ],
 )
 def test_zurl_normalize_main(zurl, zurl_norm_ok):

lib/zodb.py

@@ -492,6 +492,11 @@ def _znormalize_neo(scheme, netloc, path, query, frag):
             # ca/cert/key is different than a URL with 'neos' scheme,
             # although both point to the same database.
             scheme = "neos"
+    # Drop client specific options.
+    # These options only affect the behaviour of the NEO client, but don't specify
+    # a different NEO server, and therefore need to be dropped.
+    for k in ("compress", "read-only", "logfile", "cache-size"):
+        q.pop(k, 0)
     query = urlparse.urlencode(q, doseq=True)
     # Sort multiple master nodes: if a NEO cluster has multiple master
     # nodes, there is no agreed on order in which the master node