dprevot/patroni
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix whitespace and refresh patches

Browse source
This commit is contained in:
Michael Banck 2019-02-08 16:03:50 +01:00
parent cfc3c81075
commit bb564a258d
3 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
debian/patches/acceptance_tests_coverage_binary.patch vendored
View file

@ -1,6 +1,8 @@
--- ./features/environment.py.orig 2019-02-08 10:37:57.008318346 +0100 Index: patroni/features/environment.py
+++ ./features/environment.py 2019-02-08 10:39:22.654197675 +0100 ===================================================================
@@ -11,6 +11,7 @@ --- patroni.orig/features/environment.py
+++ patroni/features/environment.py
@@ -11,6 +11,7 @@ import shutil
import signal import signal
import six import six
import subprocess import subprocess
@ -8,17 +10,17 @@
import tempfile import tempfile
import threading import threading
import time import time
@@ -141,7 +141,8 @@ @@ -141,7 +142,8 @@ class PatroniController(AbstractControll
if isinstance(self._context.dcs_ctl, KubernetesController): if isinstance(self._context.dcs_ctl, KubernetesController):
self._context.dcs_ctl.create_pod(self._name[8:], self._scope) self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1] 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(['coverage', 'run', '--source=patroni', '-p', 'patroni.py', self._config],
+ return subprocess.Popen([sys.executable, '-m', 'coverage', 'run', + return subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
+ '--source=patroni', '-p', 'patroni.py', self._config], + '--source=patroni', '-p', 'patroni.py', 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):
@@ -809,8 +810,8 @@ @@ -811,8 +813,8 @@ def before_all(context):
def after_all(context): def after_all(context):
context.dcs_ctl.stop() context.dcs_ctl.stop()
@ -29,9 +31,11 @@
def before_feature(context, feature): def before_feature(context, feature):
--- ./features/steps/patroni_api.py.orig 2019-02-08 10:39:27.598301865 +0100 Index: patroni/features/steps/patroni_api.py
+++ ./features/steps/patroni_api.py 2019-02-08 10:39:48.942746671 +0100 ===================================================================
@@ -5,6 +5,7 @@ --- patroni.orig/features/steps/patroni_api.py
+++ patroni/features/steps/patroni_api.py
@@ -5,6 +5,7 @@ import parse
import requests import requests
import shlex import shlex
import subprocess import subprocess
@ -39,7 +43,7 @@
import time import time
import yaml import yaml
@@ -95,7 +95,7 @@ @@ -95,7 +96,7 @@ def do_request(context, request_method,
@step('I run {cmd}') @step('I run {cmd}')
def do_run(context, cmd): def do_run(context, cmd):

2
debian/patches/acceptance_tests_postgres_port.patch vendored
View file

@ -2,7 +2,7 @@ Index: patroni/features/environment.py
=================================================================== ===================================================================
--- patroni.orig/features/environment.py --- patroni.orig/features/environment.py
+++ patroni/features/environment.py +++ patroni/features/environment.py
@@ -83,7 +83,7 @@ class AbstractController(object): @@ -84,7 +84,7 @@ class AbstractController(object):
class PatroniController(AbstractController): class PatroniController(AbstractController):

4
debian/patches/acceptance_tests_system_patroni.patch vendored
View file

@ -2,11 +2,11 @@ Index: patroni/features/environment.py
=================================================================== ===================================================================
--- patroni.orig/features/environment.py --- patroni.orig/features/environment.py
+++ patroni/features/environment.py +++ patroni/features/environment.py
@@ -141,8 +141,7 @@ class PatroniController(AbstractControll @@ -142,8 +142,7 @@ class PatroniController(AbstractControll
if isinstance(self._context.dcs_ctl, KubernetesController): if isinstance(self._context.dcs_ctl, KubernetesController):
self._context.dcs_ctl.create_pod(self._name[8:], self._scope) self._context.dcs_ctl.create_pod(self._name[8:], self._scope)
os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1] os.environ['PATRONI_KUBERNETES_POD_IP'] = '10.0.0.' + self._name[-1]
- return subprocess.Popen([sys.executable, '-m', 'coverage', 'run', - return subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
- '--source=patroni', '-p', 'patroni.py', self._config], - '--source=patroni', '-p', 'patroni.py', self._config],
+ return subprocess.Popen([sys.executable, '-m', 'coverage', 'run', '-p', '/usr/bin/patroni', self._config], + return subprocess.Popen([sys.executable, '-m', 'coverage', '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)