From bb564a258d01a06df2c469a7d879d71a076978e7 Mon Sep 17 00:00:00 2001
From: Michael Banck <mbanck@debian.org>
Date: Fri, 8 Feb 2019 16:03:50 +0100
Subject: [PATCH] Fix whitespace and refresh patches

---
 .../acceptance_tests_coverage_binary.patch    | 24 +++++++++++--------
 .../acceptance_tests_postgres_port.patch      |  2 +-
 .../acceptance_tests_system_patroni.patch     |  4 ++--
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/debian/patches/acceptance_tests_coverage_binary.patch b/debian/patches/acceptance_tests_coverage_binary.patch
index 76cbfc9..d7b2da1 100644
--- a/debian/patches/acceptance_tests_coverage_binary.patch
+++ b/debian/patches/acceptance_tests_coverage_binary.patch
@@ -1,6 +1,8 @@
---- ./features/environment.py.orig	2019-02-08 10:37:57.008318346 +0100
-+++ ./features/environment.py	2019-02-08 10:39:22.654197675 +0100
-@@ -11,6 +11,7 @@
+Index: patroni/features/environment.py
+===================================================================
+--- patroni.orig/features/environment.py
++++ patroni/features/environment.py
+@@ -11,6 +11,7 @@ import shutil
  import signal
  import six
  import subprocess
@@ -8,17 +10,17 @@
  import tempfile
  import threading
  import time
-@@ -141,7 +141,8 @@
+@@ -141,7 +142,8 @@ 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([sys.executable, '-m', 'coverage', 'run',
++        return subprocess.Popen([sys.executable, '-m', '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):
-@@ -809,8 +810,8 @@
+@@ -811,8 +813,8 @@ def before_all(context):
  
  def after_all(context):
      context.dcs_ctl.stop()
@@ -29,9 +31,11 @@
  
  
  def before_feature(context, feature):
---- ./features/steps/patroni_api.py.orig	2019-02-08 10:39:27.598301865 +0100
-+++ ./features/steps/patroni_api.py	2019-02-08 10:39:48.942746671 +0100
-@@ -5,6 +5,7 @@
+Index: patroni/features/steps/patroni_api.py
+===================================================================
+--- patroni.orig/features/steps/patroni_api.py
++++ patroni/features/steps/patroni_api.py
+@@ -5,6 +5,7 @@ import parse
  import requests
  import shlex
  import subprocess
@@ -39,7 +43,7 @@
  import time
  import yaml
  
-@@ -95,7 +95,7 @@
+@@ -95,7 +96,7 @@ def do_request(context, request_method,
  
  @step('I run {cmd}')
  def do_run(context, cmd):
diff --git a/debian/patches/acceptance_tests_postgres_port.patch b/debian/patches/acceptance_tests_postgres_port.patch
index 7d4dca8..888f2e8 100644
--- a/debian/patches/acceptance_tests_postgres_port.patch
+++ b/debian/patches/acceptance_tests_postgres_port.patch
@@ -2,7 +2,7 @@ Index: patroni/features/environment.py
 ===================================================================
 --- patroni.orig/features/environment.py
 +++ patroni/features/environment.py
-@@ -83,7 +83,7 @@ class AbstractController(object):
+@@ -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 58d805b..5677c61 100644
--- a/debian/patches/acceptance_tests_system_patroni.patch
+++ b/debian/patches/acceptance_tests_system_patroni.patch
@@ -2,11 +2,11 @@ Index: patroni/features/environment.py
 ===================================================================
 --- patroni.orig/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):
              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([sys.executable, '-m', 'coverage', 'run',
+-        return subprocess.Popen([sys.executable, '-m', 'coverage', 'run',
 -                                '--source=patroni', '-p', 'patroni.py', 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)