* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.
* debian/patches/acceptance_tests_postgres_port.patch: Likewise.
This commit is contained in:
parent
8a65afb554
commit
85a4ca636b
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -7,6 +7,8 @@ patroni (1.5.4-7) UNRELEASED; urgency=medium
|
||||||
* debian/patches/coverage_binary.patch: Removed, and replaced with ...
|
* debian/patches/coverage_binary.patch: Removed, and replaced with ...
|
||||||
* debian/patches/acceptance_tests_coverage_binary.patch: ... this patch,
|
* debian/patches/acceptance_tests_coverage_binary.patch: ... this patch,
|
||||||
which is generally applicable.
|
which is generally applicable.
|
||||||
|
* debian/patches/acceptance_tests_system_patroni.patch: Refreshed.
|
||||||
|
* debian/patches/acceptance_tests_postgres_port.patch: Likewise.
|
||||||
|
|
||||||
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Mon, 04 Feb 2019 21:12:35 +0100
|
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Mon, 04 Feb 2019 21:12:35 +0100
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
--- ./features/environment.py.orig 2019-01-26 17:56:16.036042086 +0100
|
Index: patroni/features/environment.py
|
||||||
+++ ./features/environment.py 2019-01-26 17:57:01.007847933 +0100
|
===================================================================
|
||||||
@@ -83,7 +83,7 @@
|
--- patroni.orig/features/environment.py
|
||||||
|
+++ patroni/features/environment.py
|
||||||
|
@@ -84,7 +84,7 @@ class AbstractController(object):
|
||||||
|
|
||||||
|
|
||||||
class PatroniController(AbstractController):
|
class PatroniController(AbstractController):
|
||||||
|
|
|
@ -2,12 +2,12 @@ Index: patroni/features/environment.py
|
||||||
===================================================================
|
===================================================================
|
||||||
--- patroni.orig/features/environment.py
|
--- patroni.orig/features/environment.py
|
||||||
+++ patroni/features/environment.py
|
+++ patroni/features/environment.py
|
||||||
@@ -141,7 +141,7 @@ class PatroniController(AbstractControll
|
@@ -147,7 +147,7 @@ class PatroniController(AbstractControll
|
||||||
if isinstance(self._context.dcs_ctl, KubernetesController):
|
if not COVERAGE_BIN:
|
||||||
self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
|
COVERAGE_BIN = distutils.spawn.find_executable('python3-coverage')
|
||||||
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([COVERAGE_BIN, 'run', '--source=patroni', '-p', 'patroni.py', self._config],
|
||||||
+ return subprocess.Popen(['python3-coverage', 'run', '-p', '/usr/bin/patroni', self._config],
|
+ return subprocess.Popen([COVERAGE_BIN, 'run', '-p', '/usr/bin/patroni', self._config],
|
||||||
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
|
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
|
||||||
|
|
||||||
def stop(self, kill=False, timeout=15, postgres=False):
|
def stop(self, kill=False, timeout=15, postgres=False):
|
||||||
|
|
Loading…
Reference in a new issue