From cea02d706bdead5ab2ff90312eb39726d7d7aef5 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Sep 18 2023 13:18:58 +0000 Subject: Merge branch 'c9s-sig-hyperscale' into c8s-sig-hyperscale --- diff --git a/systemd.spec b/systemd.spec index 73d8b9e..7662adc 100644 --- a/systemd.spec +++ b/systemd.spec @@ -959,7 +959,8 @@ install -p -m 0644 /tmp/selinux/systemd_hs.pp.bz2 %{buildroot}%{_datadir}/selinu %check %if %{with tests} -meson test -C %{_vpath_builddir} -t 6 --print-errorlogs +# Add --num-processes 1 as workaround for issue: AttributeError: 'NoneType' object has no attribute '_add_reader' - https://github.com/python/cpython/issues/82200 +meson test -C %{_vpath_builddir} -t 6 --print-errorlogs --num-processes 1 %endif ############################################################################################# @@ -1298,6 +1299,9 @@ rm -f .file-list-* rm -f %{name}.lang %changelog +* Mon Sep 18 2023 Daan De Meyer - 253.7-1.7 +- Limit parallelism when running tests to avoid hitting bug in python 3.6 + * Thu Sep 14 2023 Anita Zhang - 253.7-1.6 - Backport fix for #27287 (daemon-reload deadlock)