- Remove exclude-tests-on-obs.patch, this is not the way how to

do it, besides %python_exec setup.py check doesn't the test
  suite.
- Make tests running properly again

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-systemd?expand=0&rev=21

0002-reader-make-PY_SSIZE_T_CLEAN.patch

@@ -4,11 +4,9 @@ Date: Thu, 12 Nov 2020 16:55:56 +0100
 Subject: [PATCH 2/2] reader: make PY_SSIZE_T_CLEAN
 
 ---
- systemd/_reader.c | 15 +++++++++++++--
+ systemd/_reader.c |   15 +++++++++++++--
  1 file changed, 13 insertions(+), 2 deletions(-)
 
-diff --git a/systemd/_reader.c b/systemd/_reader.c
-index 8de7f6a963..3b6a4d0bbc 100644
 --- a/systemd/_reader.c
 +++ b/systemd/_reader.c
 @@ -18,7 +18,12 @@
@@ -24,7 +22,7 @@ index 8de7f6a963..3b6a4d0bbc 100644
  #include <structmember.h>
  #include <datetime.h>
  #include <time.h>
-@@ -710,11 +715,17 @@ PyDoc_STRVAR(Reader_add_match__doc__,
+@@ -707,11 +712,17 @@ PyDoc_STRVAR(Reader_add_match__doc__,
               "Match is a string of the form \"FIELD=value\".");
  static PyObject* Reader_add_match(Reader *self, PyObject *args, PyObject *keywds) {
          char *match;

exclude-tests-on-obs.patch

@@ -1,22 +0,0 @@
-diff -ur python-systemd-234-orig/systemd/test/test_journal.py python-systemd-234/systemd/test/test_journal.py
---- python-systemd-234-orig/systemd/test/test_journal.py	2017-03-26 03:33:59.000000000 +0200
-+++ python-systemd-234/systemd/test/test_journal.py	2017-06-26 11:15:19.961627278 +0200
-@@ -215,12 +215,12 @@
-         j.this_boot(TEST_MID)
-         j.this_boot(TEST_MID.hex)
- 
--def test_reader_this_machine(tmpdir):
--    j = journal.Reader(path=tmpdir.strpath)
--    with j:
--        j.this_machine()
--        j.this_machine(TEST_MID)
--        j.this_machine(TEST_MID.hex)
-+#def test_reader_this_machine(tmpdir):
-+#    j = journal.Reader(path=tmpdir.strpath)
-+#    with j:
-+#        j.this_machine()
-+#        j.this_machine(TEST_MID)
-+#        j.this_machine(TEST_MID.hex)
- 
- def test_reader_query_unique(tmpdir):
-     j = journal.Reader(path=tmpdir.strpath)

python-systemd.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Jul  3 21:14:35 UTC 2022 - Matej Cepl <mcepl@suse.com>
+
+- Remove exclude-tests-on-obs.patch, this is not the way how to
+  do it, besides %python_exec setup.py check doesn't the test
+  suite.
+- Make tests running properly again
+
 -------------------------------------------------------------------
 Sun Jul  3 18:00:37 UTC 2022 - Arjen de Korte <suse+build@de-korte.org>
 

python-systemd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package python-systemd
 #
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,6 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_without test
 Name:           python-systemd
 Version:        234
 Release:        0
@@ -28,10 +27,10 @@ URL:            https://github.com/systemd/python-systemd
 Source:         https://github.com/systemd/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 # PATCH-FIX-OPENSUSE iso-c-90.patch makes the building iso-c-90 compatible to allow building on SLE12 SP3
 Patch1:         iso-c-90.patch
-# PATCH-FIX-OPENSUSE exclude-tests-on-obs.patch removes a test when running tests at OBS. Should be removed as soon as OBS is fixed
+# PATCH-FIX-UPSTREAM 0002-reader-make-PY_SSIZE_T_CLEAN.patch gh#systemd/python-systemd#107 mcepl@suse.com
-Patch100:       exclude-tests-on-obs.patch
+# Originally from gh#systemd/python-systemd/commit/c71bbac357f0
-# PATCH-FIX-UPSTREAM reader: make PY_SSIZE_T_CLEAN
+# make PY_SSIZE_T_CLEAN
-Patch101:       0002-reader-make-PY_SSIZE_T_CLEAN.patch
+Patch2:         0002-reader-make-PY_SSIZE_T_CLEAN.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  fdupes
@@ -42,9 +41,7 @@ BuildRequires:  pkgconfig(libsystemd)
 Requires:       systemd
 Suggests:       %{name}-doc
 # /SECTION
-%if %{with test}
 BuildRequires:  %{python_module pytest}
-%endif
 %python_subpackages
 
 %description
@@ -62,15 +59,16 @@ Python module for native access to the systemd facilities. Functionality is sepe
 
 %install
 %python_install
-%fdupes %{buildroot}
+%python_expand %fdupes %{buildroot}%{$python_sitearch}
 
-%if %{with test}
 %check
-%python_exec setup.py check
+export PYTEST_ADDOPTS="-k 'not test_reader_this_machine'"
-%endif
+%python_expand make PYTHON=python%{$python_version} check
 
 %files %{python_files}
-%doc LICENSE.txt README.md
+%license LICENSE.txt
-%{python_sitearch}/*
+%doc README.md
+%{python_sitearch}/systemd
+%{python_sitearch}/systemd_python-%{version}*-info
 
 %changelog