Merge branch 'master' of github.com:zalando/patroni into feature/api-https

tests/test_etcd.py

@@ -93,9 +93,9 @@ def etcd_delete(key, **kwargs):
 
 
 def etcd_read(key, **kwargs):
-    if key == '/service/noleader':
+    if key == '/service/noleader/':
         raise DCSError('noleader')
-    elif key == '/service/nocluster':
+    elif key == '/service/nocluster/':
         raise etcd.EtcdKeyNotFound
 
     response = {"action": "get", "node": {"key": "/service/batman5", "dir": True, "nodes": [

tests/test_zookeeper.py

@@ -56,9 +56,9 @@ class MockKazooClient:
         func(*args, **kwargs)
 
     def get(self, path, watch=None):
-        if path == '/service/test/no_node':
+        if path == '/no_node':
             raise NoNodeError
-        elif path == '/service/test/other_exception':
+        elif path == '/other_exception':
             raise Exception()
         elif '/members/' in path:
             return (