Merge branch 'master' into 'master'

Ensure no etcd server is running before acceptance tests

See merge request postgresql/patroni!2
This commit is contained in:
Michael Banck 2023-01-08 21:01:36 +00:00
commit d1ffa2f934
2 changed files with 9 additions and 2 deletions

View file

@ -44,6 +44,13 @@ case $DEB_HOST_ARCH in
;;
esac
# ensure no etcd server is running.
if [ $(id -u) -eq 0 ]
then
service etcd stop
service etcd status || true
fi
set -x
for PG_VERSION in $(ls -1r /usr/lib/postgresql/); do
echo "### PostgreSQL $PG_VERSION acceptance-$DCS $@ ###"

View file

@ -22,7 +22,7 @@ Depends:
python3-etcd (>= 0.4.3),
@,
Test-Command: debian/tests/acceptance etcd features/basic_replication.feature
Restrictions: allow-stderr
Restrictions: needs-root, allow-stderr
Features: test-name=acceptance-etcd
Depends:
@ -34,7 +34,7 @@ Depends:
python3-etcd (>= 0.4.3),
@,
Test-Command: debian/tests/acceptance etcd
Restrictions: allow-stderr, flaky
Restrictions: needs-root, allow-stderr, flaky
# consul
Features: test-name=acceptance-consul