* debian/tests/acceptance: Simply set $PATH before running behave, drop the
$PATRONI_POSTGRESQL_BIN_DIR handling. * debian/patches/testsuite_honor_patroni_postgresql_bin_dir.patch: Removed, no longer needed.
This commit is contained in:
parent
eba7f46987
commit
e0967b5a0f
1
debian/patches/series
vendored
1
debian/patches/series
vendored
|
@ -3,4 +3,3 @@ sphinx_no_mathjax.patch
|
|||
startup_scripts.patch
|
||||
coverage_binary.patch
|
||||
relax_kazoo_requirement.patch
|
||||
testsuite_honor_patroni_postgresql_bin_dir.patch
|
||||
|
|
|
@ -1,15 +0,0 @@
|
|||
--- ./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()
|
2
debian/tests/acceptance
vendored
2
debian/tests/acceptance
vendored
|
@ -16,5 +16,5 @@ else
|
|||
fi
|
||||
|
||||
for PG_VERSION in /usr/lib/postgresql/*; do
|
||||
$SU "export PATRONI_POSTGRESQL_BIN_DIR=/usr/lib/postgresql/$(basename ${PG_VERSION})/bin; behave"
|
||||
$SU "PATH=/usr/lib/postgresql/$(basename ${PG_VERSION})/bin:$PATH behave"
|
||||
done
|
||||
|
|
Loading…
Reference in a new issue