* debian/tests/control: Use `Test-Command' directive with relative path
instead of `Tests' and pass it the DCS as argument. * debian/tests/acceptance: Set DCS variable as provided by the command-line argument.
This commit is contained in:
parent
1d92f074a2
commit
d1d4bf1b0c
4
debian/changelog
vendored
4
debian/changelog
vendored
|
@ -3,6 +3,10 @@ patroni (1.5.4-5) UNRELEASED; urgency=medium
|
|||
[ Michael Banck ]
|
||||
* debian/config.yml.in: Set postgresql.pgpass option and add a commented-out
|
||||
pg_hba line for md5 connections from the local network.
|
||||
* debian/tests/control: Use `Test-Command' directive with relative path
|
||||
instead of `Tests' and pass it the DCS as argument.
|
||||
* debian/tests/acceptance: Set DCS variable as provided by the command-line
|
||||
argument.
|
||||
|
||||
-- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Tue, 29 Jan 2019 11:22:38 +0100
|
||||
|
||||
|
|
8
debian/tests/acceptance
vendored
8
debian/tests/acceptance
vendored
|
@ -5,7 +5,7 @@ set -e
|
|||
export LC_ALL=C.UTF-8
|
||||
export LANG=C.UTF-8
|
||||
export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',)
|
||||
DCS=etcd
|
||||
DCS=$1
|
||||
|
||||
if [ $(id -u) -eq 0 ]
|
||||
then
|
||||
|
@ -19,7 +19,6 @@ then
|
|||
# JAVA_OPTS need to be set, otherwise zookeeper is not reachable via IPV4
|
||||
sed -i -e 's/#JAVA_OPTS=""/JAVA_OPTS="-Djava.net.preferIPv4Stack=true"/' /etc/default/zookeeper
|
||||
/etc/init.d/zookeeper start
|
||||
DCS=zookeeper
|
||||
# let Java have some more time to startup
|
||||
sleep 5
|
||||
fi
|
||||
|
@ -27,11 +26,6 @@ else
|
|||
SU='bash -c'
|
||||
fi
|
||||
|
||||
if [ -x /usr/bin/consul ]
|
||||
then
|
||||
DCS=consul
|
||||
fi
|
||||
|
||||
# clean up afterwards
|
||||
trap 'rm -f /tmp/pgpass?; if [ $(id -u) -eq 0 ] && [ -x /etc/init.d/zookeeper ]; then /etc/init.d/zookeeper stop; fi' 0 2 3 15
|
||||
|
||||
|
|
6
debian/tests/control
vendored
6
debian/tests/control
vendored
|
@ -9,7 +9,7 @@ Depends:
|
|||
python3-kazoo,
|
||||
python3-kubernetes,
|
||||
@,
|
||||
Tests: acceptance
|
||||
Test-Command: debian/tests/acceptance consul
|
||||
Restrictions: allow-stderr
|
||||
|
||||
# etcd
|
||||
|
@ -23,7 +23,7 @@ Depends:
|
|||
python3-kazoo,
|
||||
python3-kubernetes,
|
||||
@,
|
||||
Tests: acceptance
|
||||
Test-Command: debian/tests/acceptance etcd
|
||||
Restrictions: allow-stderr
|
||||
|
||||
# zookeper
|
||||
|
@ -37,7 +37,7 @@ Depends:
|
|||
python3-kazoo,
|
||||
python3-kubernetes,
|
||||
@,
|
||||
Tests: acceptance
|
||||
Test-Command: debian/tests/acceptance zookeeper
|
||||
Restrictions: needs-root, allow-stderr
|
||||
|
||||
# regression tests
|
||||
|
|
Loading…
Reference in a new issue