* debian/patches/testsuite_honor_patroni_postgresql_bin_dir.patch:
New patch, makes the accceptance testsuite honor the $PATRONI_POSTGRESQL_BIN_DIR environment variable when trying to kill postgres via pg_ctl.
This commit is contained in:
parent
3e3cf26a97
commit
638eb126d7
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -3,3 +3,4 @@ sphinx_no_mathjax.patch
|
||||||
startup_scripts.patch
|
startup_scripts.patch
|
||||||
coverage_binary.patch
|
coverage_binary.patch
|
||||||
relax_kazoo_requirement.patch
|
relax_kazoo_requirement.patch
|
||||||
|
testsuite_honor_patroni_postgresql_bin_dir.patch
|
||||||
|
|
15
debian/patches/testsuite_honor_patroni_postgresql_bin_dir.patch
vendored
Normal file
15
debian/patches/testsuite_honor_patroni_postgresql_bin_dir.patch
vendored
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
--- ./features/environment.py.orig 2017-09-29 14:54:22.558666638 +0200
|
||||||
|
+++ ./features/environment.py 2017-09-29 14:58:32.971607543 +0200
|
||||||
|
@@ -130,7 +130,11 @@
|
||||||
|
|
||||||
|
def stop(self, kill=False, timeout=15, postgres=False):
|
||||||
|
if postgres:
|
||||||
|
- return subprocess.call(['pg_ctl', '-D', self._data_dir, 'stop', '-mi', '-w'])
|
||||||
|
+ cmd = 'pg_ctl'
|
||||||
|
+ pgbindir = os.environ['PATRONI_POSTGRESQL_BIN_DIR']
|
||||||
|
+ if pgbindir is not None:
|
||||||
|
+ cmd = pgbindir + '/pg_ctl'
|
||||||
|
+ return subprocess.call([cmd, '-D', self._data_dir, 'stop', '-mi', '-w'])
|
||||||
|
super(PatroniController, self).stop(kill, timeout)
|
||||||
|
if self.watchdog:
|
||||||
|
self.watchdog.stop()
|
Loading…
Reference in a new issue