Commit e6f0ce9a authored by Levin Zimmermann's avatar Levin Zimmermann

Revert "Y client: Don't allow master_nodes and name to be present in options"

This reverts commit 6047f893 in order to
replace it with py upstream commit nexedi/neoppod@22ccebd6.
parent bbfb6d12
......@@ -44,8 +44,6 @@ def neo_zconf_options():
options = {k for k, _ in neo_storage_zconf}
assert 'master_nodes' in options
assert 'name' in options
options.remove('master_nodes') # comes in netloc
options.remove('name') # comes in path
for opt in _credopts:
assert opt in options, opt
......
......@@ -71,10 +71,6 @@ class ZODBURITests(unittest.TestCase):
# master/db not fully specified
self.assertRaises(ValueError, _resolve_uri, "neo://master")
# master_nodes and name provided in option (they come in netloc and path)
self.assertRaises(ValueError, _resolve_uri, "neo://master/db?master_nodes=a,b,c")
self.assertRaises(ValueError, _resolve_uri, "neo://master/db?name=zzz")
# option that corresponds to credential provided in query
self.assertRaises(ValueError, _resolve_uri, "neos://master/db?ca=123")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment