* debian/patches/coverage_binary.patch: Updated.

This commit is contained in:
Michael Banck 2018-01-24 07:03:28 +01:00
parent 1c14a2bb17
commit 9e6cd83f7b
2 changed files with 15 additions and 10 deletions

1
debian/changelog vendored
View file

@ -9,6 +9,7 @@ patroni (1.4.1-1) UNRELEASED; urgency=medium
* debian/patches/pgpass_in_testsuite.patch: Removed, no longer needed.
* debian/patches/sphinx_no_mathjax.patch: Refreshed.
* debian/patches/startup_scripts.patch: Updated.
* debian/patches/coverage_binary.patch: Likewiese.
-- Christoph Berg <myon@debian.org> Mon, 25 Dec 2017 18:03:36 +0100

View file

@ -1,15 +1,17 @@
--- ./features/environment.py.orig 2017-09-15 14:09:19.665359208 +0200
+++ ./features/environment.py 2017-09-15 14:10:41.945149858 +0200
@@ -125,7 +125,7 @@
def _start(self):
if self.watchdog:
self.watchdog.start()
Index: patroni/features/environment.py
===================================================================
--- patroni.orig/features/environment.py
+++ patroni/features/environment.py
@@ -130,7 +130,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(['coverage', 'run', '--source=patroni', '-p', 'patroni.py', self._config],
+ return subprocess.Popen(['python3-coverage', 'run', '--source=patroni', '-p', 'patroni.py', self._config],
stdout=self._log, stderr=subprocess.STDOUT, cwd=self._work_directory)
def stop(self, kill=False, timeout=15, postgres=False):
@@ -727,8 +727,8 @@
@@ -792,8 +792,8 @@ def before_all(context):
def after_all(context):
context.dcs_ctl.stop()
@ -20,9 +22,11 @@
def before_feature(context, feature):
--- ./features/steps/patroni_api.py.orig 2017-09-15 14:11:07.974191619 +0200
+++ ./features/steps/patroni_api.py 2017-09-15 14:11:15.304544131 +0200
@@ -92,7 +92,7 @@
Index: patroni/features/steps/patroni_api.py
===================================================================
--- patroni.orig/features/steps/patroni_api.py
+++ patroni/features/steps/patroni_api.py
@@ -95,7 +95,7 @@ def do_request(context, request_method,
@step('I run {cmd}')
def do_run(context, cmd):