From 39ea5d206b009602885368aa37181385c849fe185ac015cb35d8327d4228e74f Mon Sep 17 00:00:00 2001
From: Matej Cepl <mcepl@suse.com>
Date: Fri, 22 Mar 2024 13:26:00 +0000
Subject: [PATCH] Accepting request 1160678 from
 home:mcalabkova:branches:devel:languages:python

- Run tests the supported way as per https://github.com/zopefoundation/ZEO/issues/240
- Drop no-longer-needed skip-PackUndoLog.patch

OBS-URL: https://build.opensuse.org/request/show/1160678
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-ZEO?expand=0&rev=31
---
 python-ZEO.changes     |  6 ++++++
 python-ZEO.spec        |  5 +----
 skip-PackUndoLog.patch | 12 ------------
 3 files changed, 7 insertions(+), 16 deletions(-)
 delete mode 100644 skip-PackUndoLog.patch

diff --git a/python-ZEO.changes b/python-ZEO.changes
index bf1971c..84b171e 100644
--- a/python-ZEO.changes
+++ b/python-ZEO.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Mar 22 12:53:07 UTC 2024 - Markéta Machová <mmachova@suse.com>
+
+- Run tests the supported way as per https://github.com/zopefoundation/ZEO/issues/240
+- Drop no-longer-needed skip-PackUndoLog.patch
+
 -------------------------------------------------------------------
 Thu Mar 21 10:28:25 UTC 2024 - Markéta Machová <mmachova@suse.com>
 
diff --git a/python-ZEO.spec b/python-ZEO.spec
index b651ddb..52d114c 100644
--- a/python-ZEO.spec
+++ b/python-ZEO.spec
@@ -24,8 +24,6 @@ Summary:        Client-Server storage implementation for ZODB
 License:        ZPL-2.1
 URL:            https://github.com/zopefoundation/ZEO
 Source:         https://files.pythonhosted.org/packages/source/Z/ZEO/ZEO-%{version}.tar.gz
-# https://github.com/zopefoundation/ZEO/issues/240
-Patch:          skip-PackUndoLog.patch
 BuildRequires:  %{python_module ZConfig}
 BuildRequires:  %{python_module ZODB >= 5.5.1}
 BuildRequires:  %{python_module manuel}
@@ -88,9 +86,8 @@ sed -i -e 's:msgpack < 0.6:msgpack:g' setup.py
 %python_clone -a %{buildroot}%{_bindir}/zeo-nagios
 
 %check
-pushd src
 export ZEO4_SERVER=1
-%pyunittest -v ZEO/tests/test*.py
+%python_expand PYTHONPATH=src %{_bindir}/zope-testrunner-%{$python_bin_suffix} -vvv --test-path src
 
 %post
 %python_install_alternative runzeo zeoctl zeopack zeo-nagios
diff --git a/skip-PackUndoLog.patch b/skip-PackUndoLog.patch
deleted file mode 100644
index a4cda1b..0000000
--- a/skip-PackUndoLog.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: ZEO-6.0.0/src/ZEO/tests/testZEO.py
-===================================================================
---- ZEO-6.0.0.orig/src/ZEO/tests/testZEO.py
-+++ ZEO-6.0.0/src/ZEO/tests/testZEO.py
-@@ -391,6 +391,7 @@ class FullGenericTests(
-         IterationTests.IterationTests):
-     """Extend GenericTests with tests that MappingStorage can't pass."""
- 
-+    @unittest.skip
-     def testPackUndoLog(self):
-         # Prevent execution of the test inherited from ``ZODB>=6.0``.
-         #