From 3e05b6d0e7746c82c7e43374dbf0b91a4ff8fc0819abcdf779566eed6614d89f Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Sun, 30 Jan 2022 01:39:36 +0000 Subject: [PATCH 1/3] - Add skip-partitions-erros.patch skipping tests failing on Linux (gh#giampaolo/psutil#2043). OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=137 --- python-psutil.changes | 6 ++++++ python-psutil.spec | 6 +++++- skip-partitions-erros.patch | 33 ++++++++++++++++++++++++++++++ skip_failing_tests.patch | 14 +++++++------ skip_rlimit_tests_on_python2.patch | 12 ++++++----- 5 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 skip-partitions-erros.patch diff --git a/python-psutil.changes b/python-psutil.changes index 0b2f272..30f618b 100644 --- a/python-psutil.changes +++ b/python-psutil.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Jan 30 01:38:45 UTC 2022 - Matej Cepl + +- Add skip-partitions-erros.patch skipping tests failing on Linux + (gh#giampaolo/psutil#2043). + ------------------------------------------------------------------- Mon Jan 10 22:51:40 UTC 2022 - Dirk Müller diff --git a/python-psutil.spec b/python-psutil.spec index d53358b..032af8b 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -36,6 +36,8 @@ Patch1: skip-obs.patch Patch2: skip_failing_tests.patch # PATCH-FIX-SLE skip_rlimit_tests_on_python2.patch alarrosa@suse.com Patch3: skip_rlimit_tests_on_python2.patch +# PATCH-FIX-UPSTREAM skip_failing_tests.patch gh#giampaolo/psutil#2043 mcepl@suse.com +Patch4: skip_failing_tests.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes @@ -89,7 +91,9 @@ export TRAVIS=1 march=`python3 -c "import platform ; print(platform.machine())"` # Note test_fetch_all is a bit flaky, occasionally failing -%python_expand PYTHONPATH=build/lib.linux-${march}-%{$python_version}/ $python -Wa psutil/tests/runner.py +%{python_expand PYTHONPATH=build/lib.linux-${march}-%{$python_version}/ +$python -Wa psutil/tests/runner.py +} %endif %files %{python_files} diff --git a/skip-partitions-erros.patch b/skip-partitions-erros.patch new file mode 100644 index 0000000..a9e6f26 --- /dev/null +++ b/skip-partitions-erros.patch @@ -0,0 +1,33 @@ +--- + psutil/tests/test_linux.py | 2 ++ + psutil/tests/test_misc.py | 1 + + 2 files changed, 3 insertions(+) + +--- a/psutil/tests/test_linux.py ++++ b/psutil/tests/test_linux.py +@@ -1288,6 +1288,7 @@ class TestRootFsDeviceFinder(PsutilTestC + self.assertRaises(FileNotFoundError, finder.ask_sys_dev_block) + finder.ask_sys_class_block() + ++ @unittest.skip("Test doesn't work on Linux.") + @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS") + def test_comparisons(self): + finder = RootFsDeviceFinder() +@@ -1316,6 +1317,7 @@ class TestRootFsDeviceFinder(PsutilTestC + findmnt_value = sh("findmnt -o SOURCE -rn /") + self.assertEqual(psutil_value, findmnt_value) + ++ @unittest.skip("Test doesn't work on Linux.") + def test_disk_partitions_mocked(self): + with mock.patch( + 'psutil._pslinux.cext.disk_partitions', +--- a/psutil/tests/test_misc.py ++++ b/psutil/tests/test_misc.py +@@ -402,6 +402,7 @@ class TestMisc(PsutilTestCase): + reload_module(psutil) + self.assertIn("version conflict", str(cm.exception).lower()) + ++ @unittest.skip("Test doesn't work on Linux.") + def test_debug(self): + if PY3: + from io import StringIO diff --git a/skip_failing_tests.patch b/skip_failing_tests.patch index d21d1c2..f95e1fd 100644 --- a/skip_failing_tests.patch +++ b/skip_failing_tests.patch @@ -1,8 +1,10 @@ -Index: psutil-5.7.3/psutil/tests/test_linux.py -=================================================================== ---- psutil-5.7.3.orig/psutil/tests/test_linux.py -+++ psutil-5.7.3/psutil/tests/test_linux.py -@@ -1564,6 +1564,8 @@ class TestSensorsBattery(PsutilTestCase) +--- + psutil/tests/test_linux.py | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/psutil/tests/test_linux.py ++++ b/psutil/tests/test_linux.py +@@ -1614,6 +1614,8 @@ class TestSensorsBattery(PsutilTestCase) self.assertIsNone(psutil.sensors_battery().power_plugged) assert m.called @@ -11,7 +13,7 @@ Index: psutil-5.7.3/psutil/tests/test_linux.py def test_emulate_energy_full_0(self): # Emulate a case where energy_full files returns 0. with mock_open_content( -@@ -1571,6 +1573,8 @@ class TestSensorsBattery(PsutilTestCase) +@@ -1621,6 +1623,8 @@ class TestSensorsBattery(PsutilTestCase) self.assertEqual(psutil.sensors_battery().percent, 0) assert m.called diff --git a/skip_rlimit_tests_on_python2.patch b/skip_rlimit_tests_on_python2.patch index 6e96549..d45ea9c 100644 --- a/skip_rlimit_tests_on_python2.patch +++ b/skip_rlimit_tests_on_python2.patch @@ -1,7 +1,9 @@ -Index: psutil-5.8.0/psutil/tests/test_process.py -=================================================================== ---- psutil-5.8.0.orig/psutil/tests/test_process.py -+++ psutil-5.8.0/psutil/tests/test_process.py +--- + psutil/tests/test_process.py | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/psutil/tests/test_process.py ++++ b/psutil/tests/test_process.py @@ -416,6 +416,7 @@ class TestProcess(PsutilTestCase): p.ionice(init) @@ -42,7 +44,7 @@ Index: psutil-5.8.0/psutil/tests/test_process.py def test_rlimit_infinity_value(self): # RLIMIT_FSIZE should be RLIM_INFINITY, which will be a really # big number on a platform with large file support. On these -@@ -1270,6 +1275,7 @@ class TestProcess(PsutilTestCase): +@@ -1276,6 +1281,7 @@ class TestProcess(PsutilTestCase): self.assertEqual(normcase(p.exe()), normcase(PYTHON_EXE)) @unittest.skipIf(not POSIX, 'POSIX only') From f25356808f9816167e05b6904dfedc57d8a3ce3a8d4ee6987e722f1108bf7416 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 2 Feb 2022 17:30:54 +0000 Subject: [PATCH 2/3] - Fix name of Patch4, it is skip-partitions-erros.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=138 --- python-psutil.changes | 5 +++++ python-psutil.spec | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/python-psutil.changes b/python-psutil.changes index 30f618b..fd3b89f 100644 --- a/python-psutil.changes +++ b/python-psutil.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 2 17:30:32 UTC 2022 - Matej Cepl + +- Fix name of Patch4, it is skip-partitions-erros.patch + ------------------------------------------------------------------- Sun Jan 30 01:38:45 UTC 2022 - Matej Cepl diff --git a/python-psutil.spec b/python-psutil.spec index 032af8b..49f6374 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -36,8 +36,8 @@ Patch1: skip-obs.patch Patch2: skip_failing_tests.patch # PATCH-FIX-SLE skip_rlimit_tests_on_python2.patch alarrosa@suse.com Patch3: skip_rlimit_tests_on_python2.patch -# PATCH-FIX-UPSTREAM skip_failing_tests.patch gh#giampaolo/psutil#2043 mcepl@suse.com -Patch4: skip_failing_tests.patch +# PATCH-FIX-UPSTREAM skip-partitions-erros.patch gh#giampaolo/psutil#2043 mcepl@suse.com +Patch4: skip-partitions-erros.patch BuildRequires: %{python_module devel} BuildRequires: %{python_module setuptools} BuildRequires: fdupes From 720c663405f953aa5d5ddc1a0bb219b77609657933e4c31441f2e2ae1077f94b Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Wed, 2 Feb 2022 17:35:07 +0000 Subject: [PATCH 3/3] Add missing export OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-psutil?expand=0&rev=139 --- python-psutil.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python-psutil.spec b/python-psutil.spec index 49f6374..be6bef3 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -91,7 +91,7 @@ export TRAVIS=1 march=`python3 -c "import platform ; print(platform.machine())"` # Note test_fetch_all is a bit flaky, occasionally failing -%{python_expand PYTHONPATH=build/lib.linux-${march}-%{$python_version}/ +%{python_expand export PYTHONPATH=build/lib.linux-${march}-%{$python_version}/ $python -Wa psutil/tests/runner.py } %endif