From eebe93b4fe47297de7a740d46a7245b74ef87f01 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Thu, 21 Apr 2022 15:00:01 +0300 Subject: [PATCH] AlmaLinux changes --- ...t_external_close-as-expected-failure.patch | 28 +++++++++++++++++++ SPECS/python-psycopg2.spec | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 SOURCES/0001-Mark-_test_external_close-as-expected-failure.patch diff --git a/SOURCES/0001-Mark-_test_external_close-as-expected-failure.patch b/SOURCES/0001-Mark-_test_external_close-as-expected-failure.patch new file mode 100644 index 0000000..2c0c617 --- /dev/null +++ b/SOURCES/0001-Mark-_test_external_close-as-expected-failure.patch @@ -0,0 +1,28 @@ +From b8f5ea5308adafe92b072d61fcbca939f9944359 Mon Sep 17 00:00:00 2001 +From: Carl George +Date: Thu, 4 Jun 2020 14:13:47 -0500 +Subject: [PATCH] Mark _test_external_close as expected failure + +This is a known upstream issue that is resolved in 2.8. The "fix" is a +bigger divergence than is appropriate for CentOS. + +https://github.com/psycopg/psycopg2/issues/927 +--- + tests/test_cursor.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/test_cursor.py b/tests/test_cursor.py +index d9dea0c5..21ade863 100755 +--- a/tests/test_cursor.py ++++ b/tests/test_cursor.py +@@ -576,6 +576,7 @@ class CursorTests(ConnectingTestCase): + wait_func = psycopg2.extras.wait_select + self._test_external_close(control_conn, connect_func, wait_func) + ++ @unittest.expectedFailure + def _test_external_close(self, control_conn, connect_func, wait_func): + # The short sleep before using victim_conn the second time makes it + # much more likely to lose the race and see the bug. Repeating the +-- +2.26.2 + \ No newline at end of file diff --git a/SPECS/python-psycopg2.spec b/SPECS/python-psycopg2.spec index 59282de..056fd81 100644 --- a/SPECS/python-psycopg2.spec +++ b/SPECS/python-psycopg2.spec @@ -40,6 +40,7 @@ Group: Applications/Databases Url: http://www.psycopg.org/psycopg/ Source0: http://www.psycopg.org/psycopg/tarballs/PSYCOPG-2-7/psycopg2-%{version}.tar.gz +Patch0: 0001-Mark-_test_external_close-as-expected-failure.patch %{?with_python2:BuildRequires: python2-debug python2-devel} %if %{with python36_module} @@ -261,6 +262,9 @@ cp -pr ZPsycopgDA/* %{buildroot}%{ZPsycopgDAdir} %changelog +* Thu Apr 21 2022 Eduard Abdullin - 2.7.5-7.alma +- Added patch 0001-Mark-_test_external_close-as-expected-failure.patch + * Thu Apr 25 2019 Tomas Orsava - 2.7.5-7 - Bumping due to problems with modular RPM upgrade path - Resolves: rhbz#1695587