From 61f3a3293ee3e66b1ac7a0d94ed29bda480f2ce7 Mon Sep 17 00:00:00 2001 From: Michael Banck Date: Tue, 2 Mar 2021 18:04:50 +0100 Subject: [PATCH] Revert commits 60f14e5, a6cbcc2, fd6d67fb --- debian/changelog | 4 ---- debian/control | 1 - debian/tests/control | 1 - debian/tests/test | 4 ++++ 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index e445586..d4a626b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,10 +6,6 @@ patroni (2.0.2-1) UNRELEASED; urgency=medium * debian/patches/acceptance_tests_system_patroni.patch: Refreshed. * debian/patches/regression_tests_disable_requirement_download.patch: Likewise. - * debian/control (Build-Depends): Added python3-pysyncobj. - * debian/tests/control: Added python3-pysyncobj to regression tests depends. - * debian/tests/test: Remove previously added removal of raft-based test - files. -- Debian PostgreSQL Maintainers Fri, 22 Jan 2021 12:46:05 +0100 diff --git a/debian/control b/debian/control index acb9245..cc2854f 100644 --- a/debian/control +++ b/debian/control @@ -29,7 +29,6 @@ Build-Depends: python3-psutil, python3-psycopg2 (>= 2.6.1), python3-pycodestyle, - python3-pysyncobj, python3-pytest, python3-pytest-cov, python3-setuptools, diff --git a/debian/tests/control b/debian/tests/control index 190e85a..632534c 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -44,7 +44,6 @@ Depends: python3-kubernetes, python3-mock, python3-pytest-cov, - python3-pysyncobj, @, Tests: test Restrictions: allow-stderr diff --git a/debian/tests/test b/debian/tests/test index cba2467..4cadf62 100755 --- a/debian/tests/test +++ b/debian/tests/test @@ -9,4 +9,8 @@ export TZ=UTC # suppress UnknownTimeZoneError('Etc/UTC',) # clean up afterwards trap 'rm -f /tmp/pgpass?' 0 2 3 15 +# remove raft tests for now +rm -f tests/test_raft*py +rm -f patroni/dcs/raft.py patroni/raft_controller.py + python3 setup.py test