From 85a4ca636b1a66f84529969674ab3268940cb54d Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Thu, 7 Feb 2019 18:04:55 +0100 Subject: [PATCH] * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. * debian/patches/acceptance_tests_postgres_port.patch: Likewise. --- debian/changelog | 2 ++ debian/patches/acceptance_tests_postgres_port.patch | 8 +++++--- debian/patches/acceptance_tests_system_patroni.patch | 12 ++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index e29a5c3..0b2a1f0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ patroni (1.5.4-7) UNRELEASED; urgency=medium * debian/patches/coverage_binary.patch: Removed, and replaced with ... * debian/patches/acceptance_tests_coverage_binary.patch: ... this patch, which is generally applicable. + * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. + * debian/patches/acceptance_tests_postgres_port.patch: Likewise. -- Debian PostgreSQL Maintainers Mon, 04 Feb 2019 21:12:35 +0100 diff --git a/debian/patches/acceptance_tests_postgres_port.patch b/debian/patches/acceptance_tests_postgres_port.patch index 06cca74..888f2e8 100644 --- a/debian/patches/acceptance_tests_postgres_port.patch +++ b/debian/patches/acceptance_tests_postgres_port.patch @@ -1,6 +1,8 @@ ---- ./features/environment.py.orig 2019-01-26 17:56:16.036042086 +0100 -+++ ./features/environment.py 2019-01-26 17:57:01.007847933 +0100 -@@ -83,7 +83,7 @@ +Index: patroni/features/environment.py +=================================================================== +--- patroni.orig/features/environment.py ++++ patroni/features/environment.py +@@ -84,7 +84,7 @@ class AbstractController(object): class PatroniController(AbstractController): diff --git a/debian/patches/acceptance_tests_system_patroni.patch b/debian/patches/acceptance_tests_system_patroni.patch index 6c8a731..8654d77 100644 --- a/debian/patches/acceptance_tests_system_patroni.patch +++ b/debian/patches/acceptance_tests_system_patroni.patch @@ -2,12 +2,12 @@ Index: patroni/features/environment.py =================================================================== --- patroni.orig/features/environment.py +++ patroni/features/environment.py -@@ -141,7 +141,7 @@ class PatroniController(AbstractControll - if isinstance(self._context.dcs_ctl, KubernetesController): - self._context.dcs_ctl.create_pod(self._name[8:], self._scope) - os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1] -- return subprocess.Popen(['python3-coverage', 'run', '--source=patroni', '-p', 'patroni.py', self._config], -+ return subprocess.Popen(['python3-coverage', 'run', '-p', '/usr/bin/patroni', self._config], +@@ -147,7 +147,7 @@ class PatroniController(AbstractControll + if not COVERAGE_BIN: + COVERAGE_BIN = distutils.spawn.find_executable('python3-coverage') + +- return subprocess.Popen([COVERAGE_BIN, 'run', '--source=patroni', '-p', 'patroni.py', self._config], ++ return subprocess.Popen([COVERAGE_BIN, 'run', '-p', '/usr/bin/patroni', self._config], stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory) def stop(self, kill=False, timeout=15, postgres=False):