From 9f0aa0cee67c4ff78f0781c8056c675f69dcf0d2 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 11 Jan 2021 00:30:54 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/python-psutil.git#15207803b45617ed2bdc04fd3c493f9c15ea57e6 --- python-psutil-skip-tests-in-mock.patch | 18 +++++++++++++++--- python-psutil.spec | 5 ++++- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/python-psutil-skip-tests-in-mock.patch b/python-psutil-skip-tests-in-mock.patch index ee297b8..93a2e1c 100644 --- a/python-psutil-skip-tests-in-mock.patch +++ b/python-psutil-skip-tests-in-mock.patch @@ -1,6 +1,6 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-release-5.8.0/psutil/tests/test_linux.py --- psutil-release-5.8.0.orig/psutil/tests/test_linux.py 2020-12-18 16:45:00.000000000 -0800 -+++ psutil-release-5.8.0/psutil/tests/test_linux.py 2021-01-10 15:33:43.145493679 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_linux.py 2021-01-10 15:38:31.104890945 -0800 @@ -661,14 +661,13 @@ value = int(value.split('-')[1]) + 1 self.assertEqual(psutil.cpu_count(), value) @@ -72,7 +72,7 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-re if '-' in str(value): diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_misc.py psutil-release-5.8.0/psutil/tests/test_misc.py --- psutil-release-5.8.0.orig/psutil/tests/test_misc.py 2020-12-18 16:45:00.000000000 -0800 -+++ psutil-release-5.8.0/psutil/tests/test_misc.py 2021-01-10 15:33:43.147493682 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_misc.py 2021-01-10 15:38:31.104890945 -0800 @@ -355,7 +355,7 @@ def test_setup_script(self): @@ -84,7 +84,7 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_misc.py psutil-rel self.assertRaises(SystemExit, module.setup) diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-release-5.8.0/psutil/tests/test_system.py --- psutil-release-5.8.0.orig/psutil/tests/test_system.py 2020-12-18 16:45:00.000000000 -0800 -+++ psutil-release-5.8.0/psutil/tests/test_system.py 2021-01-10 15:35:53.476673481 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_system.py 2021-01-10 15:38:31.105890946 -0800 @@ -198,7 +198,7 @@ self.assertGreater(bt, 0) self.assertLess(bt, time.time()) @@ -120,3 +120,15 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-r def test_sensors_temperatures(self): temps = psutil.sensors_temperatures() for name, entries in temps.items(): +diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_testutils.py psutil-release-5.8.0/psutil/tests/test_testutils.py +--- psutil-release-5.8.0.orig/psutil/tests/test_testutils.py 2020-12-18 16:45:00.000000000 -0800 ++++ psutil-release-5.8.0/psutil/tests/test_testutils.py 2021-01-10 15:48:14.240695423 -0800 +@@ -364,7 +364,7 @@ + self.assertRaises(ValueError, self.execute, lambda: 0, retries=-1) + + @retry_on_failure() +- @unittest.skipIf(CI_TESTING, "skipped on CI") ++ @unittest.skip("Unreliable in mock") + def test_leak_mem(self): + ls = [] + diff --git a/python-psutil.spec b/python-psutil.spec index 22e9328..c1f28cc 100644 --- a/python-psutil.spec +++ b/python-psutil.spec @@ -6,7 +6,7 @@ Name: python-%{srcname} Version: 5.8.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: %{sum} License: BSD @@ -110,6 +110,9 @@ make test CI_TESTING=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sit %changelog +* Sun Jan 10 2021 Kevin Fenzi - 5.8.0-3 +- Disable test_leak_mem test. + * Sun Jan 10 2021 Kevin Fenzi - 5.8.0-2 - Disable test_sensors_temperatures test.