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

* debian/tests/control: Use `Test-Command' directive with relative path

Browse source 
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:
Michael Banck 2019-01-30 12:57:32 +01:00
parent 1d92f074a2
commit d1d4bf1b0c
3 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debian/changelog vendored
View file

@ -3,6 +3,10 @@ patroni (1.5.4-5) UNRELEASED; urgency=medium
[ Michael Banck ] [ Michael Banck ]
* debian/config.yml.in: Set postgresql.pgpass option and add a commented-out * debian/config.yml.in: Set postgresql.pgpass option and add a commented-out
pg_hba line for md5 connections from the local network. 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 -- Debian PostgreSQL Maintainers <team+postgresql@tracker.debian.org> Tue, 29 Jan 2019 11:22:38 +0100

8
debian/tests/acceptance vendored
View file

@ -5,7 +5,7 @@ set -e
export LC_ALL=C.UTF-8 export LC_ALL=C.UTF-8
export LANG=C.UTF-8 export LANG=C.UTF-8
export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',) export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',)
DCS=etcd DCS=$1
if [ $(id -u) -eq 0 ] if [ $(id -u) -eq 0 ]
then then
@ -19,7 +19,6 @@ then
# JAVA_OPTS need to be set, otherwise zookeeper is not reachable via IPV4 # 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 sed -i -e 's/#JAVA_OPTS=""/JAVA_OPTS="-Djava.net.preferIPv4Stack=true"/' /etc/default/zookeeper
/etc/init.d/zookeeper start /etc/init.d/zookeeper start
DCS=zookeeper
# let Java have some more time to startup # let Java have some more time to startup
sleep 5 sleep 5
fi fi
@ -27,11 +26,6 @@ else
SU='bash -c' SU='bash -c'
fi fi
if [ -x /usr/bin/consul ]
then
DCS=consul
fi
# clean up afterwards # 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 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
View file

@ -9,7 +9,7 @@ Depends:
python3-kazoo, python3-kazoo,
python3-kubernetes, python3-kubernetes,
@, @,
Tests: acceptance Test-Command: debian/tests/acceptance consul
Restrictions: allow-stderr Restrictions: allow-stderr
# etcd # etcd
@ -23,7 +23,7 @@ Depends:
python3-kazoo, python3-kazoo,
python3-kubernetes, python3-kubernetes,
@, @,
Tests: acceptance Test-Command: debian/tests/acceptance etcd
Restrictions: allow-stderr Restrictions: allow-stderr
# zookeper # zookeper
@ -37,7 +37,7 @@ Depends:
python3-kazoo, python3-kazoo,
python3-kubernetes, python3-kubernetes,
@, @,
Tests: acceptance Test-Command: debian/tests/acceptance zookeeper
Restrictions: needs-root, allow-stderr Restrictions: needs-root, allow-stderr
# regression tests # regression tests