diff --git a/debian/changelog b/debian/changelog index 5215161..e1f2a06 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,11 @@ patroni (2.1.1-1) UNRELEASED; urgency=medium + [ Debian PostgreSQL Maintainers ] * New upstream release. + [ Michael Banck ] + * debian/patches/regression_tests_disable_raft_tests.py: Refreshed. + -- Debian PostgreSQL Maintainers Fri, 09 Jul 2021 16:59:35 +0200 patroni (2.1.0-1) experimental; urgency=medium diff --git a/debian/patches/regression_tests_disable_raft_tests.py b/debian/patches/regression_tests_disable_raft_tests.py index 32c4a39..8f4120d 100644 --- a/debian/patches/regression_tests_disable_raft_tests.py +++ b/debian/patches/regression_tests_disable_raft_tests.py @@ -1,5 +1,7 @@ ---- patroni-2.0.2.orig/patroni/validator.py -+++ patroni-2.0.2/patroni/validator.py +Index: patroni/patroni/validator.py +=================================================================== +--- patroni.orig/patroni/validator.py ++++ patroni/patroni/validator.py @@ -53,13 +53,9 @@ def validate_host_port(host_port, listen return True @@ -16,7 +18,7 @@ def validate_host_port_listen(host_port): -@@ -295,20 +291,11 @@ def assert_(condition, message="Wrong va +@@ -295,21 +291,11 @@ def assert_(condition, message="Wrong va userattributes = {"username": "", Optional("password"): ""} available_dcs = [m.split(".")[-1] for m in dcs_modules()] @@ -27,17 +29,18 @@ validate_host_port_listen_multiple_hosts.expected_type = string_types validate_data_dir.expected_type = string_types -validate_etcd = { -- Or("host", "hosts", "srv", "url", "proxy"): Case({ +- Or("host", "hosts", "srv", "srv_suffix", "url", "proxy"): Case({ - "host": validate_host_port, - "hosts": Or(comma_separated_host_port, [validate_host_port]), - "srv": str, +- "srv_suffix": str, - "url": str, - "proxy": str}) -} schema = Schema({ "name": str, -@@ -333,20 +320,19 @@ schema = Schema({ +@@ -334,20 +320,19 @@ schema = Schema({ "host": validate_host_port, "url": str}) }, @@ -66,8 +69,10 @@ "zookeeper": { "hosts": Or(comma_separated_host_port, [validate_host_port]), }, ---- patroni-2.0.2.orig/tests/test_validator.py -+++ patroni-2.0.2/tests/test_validator.py +Index: patroni/tests/test_validator.py +=================================================================== +--- patroni.orig/tests/test_validator.py ++++ patroni/tests/test_validator.py @@ -33,21 +33,11 @@ config = { "etcd": { "hosts": "127.0.0.1:2379,127.0.0.1:2380"