From 646fff424bddc8edd22b6682b58e0467ac9d9ce2 Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Tue, 15 Feb 2022 21:09:06 +0100 Subject: [PATCH] * debian/tests/acceptance: Skip standby_cluster/logical_slots_in_sync scenario on v10, as it is not supported there. --- debian/changelog | 2 ++ debian/tests/acceptance | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4792739..cee2c46 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ patroni (2.1.2-3) UNRELEASED; urgency=medium * debian/patches/regression_tests_psutil_compat.patch: New patch, add compatibility for newer psutil in the regression tests (Closes: #1003562). * debian/changelog: Fix whitespace. + * debian/tests/acceptance: Skip standby_cluster/logical_slots_in_sync + scenario on v10, as it is not supported there. -- Debian PostgreSQL Maintainers Sun, 13 Feb 2022 15:54:41 +0100 diff --git a/debian/tests/acceptance b/debian/tests/acceptance index 80578a4..e6557ba 100755 --- a/debian/tests/acceptance +++ b/debian/tests/acceptance @@ -47,8 +47,14 @@ case $DEB_HOST_ARCH in esac set -x -for PG_VERSION in /usr/lib/postgresql/*; do - $SU "set -o pipefail; ETCD_UNSUPPORTED_ARCH=$ETCD_ARCH DCS=$DCS PATH=/usr/lib/postgresql/$(basename \ - ${PG_VERSION})/bin:$PATH behave | ts" || \ +for PG_VERSION in $(ls -1r /usr/lib/postgresql/); do + if [ "${PG_VERSION}" == "10" ]; then + SKIP=--tags=-skip + else + SKIP= + fi + $SU "set -o pipefail; ETCD_UNSUPPORTED_ARCH=$ETCD_ARCH DCS=$DCS \ + PATH=/usr/lib/postgresql/${PG_VERSION}/bin:$PATH \ + behave ${SKIP} | ts" || \ (for file in $(ls features/output/*_failed/*); do echo "$file:"; cat $file; done && exit 1) done