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#3d5b05e393d2fc3eb26b10b6f5198ca99f210273
This commit is contained in:
DistroBaker 2021-01-10 23:57:53 +00:00
parent ce792a4701
commit 818584e6c5
2 changed files with 17 additions and 4 deletions

View File

@ -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-01 14:10:19.593349892 -0800
+++ psutil-release-5.8.0/psutil/tests/test_linux.py 2021-01-10 15:33:43.145493679 -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-01 13:23:02.950528959 -0800
+++ psutil-release-5.8.0/psutil/tests/test_misc.py 2021-01-10 15:33:43.147493682 -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-01 13:55:31.097319884 -0800
+++ psutil-release-5.8.0/psutil/tests/test_system.py 2021-01-10 15:35:53.476673481 -0800
@@ -198,7 +198,7 @@
self.assertGreater(bt, 0)
self.assertLess(bt, time.time())
@ -111,3 +111,12 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-r
def test_disk_partitions(self):
def check_ntuple(nt):
self.assertIsInstance(nt.device, str)
@@ -828,7 +829,7 @@
class TestSensorsAPIs(PsutilTestCase):
- @unittest.skipIf(not HAS_SENSORS_TEMPERATURES, "not supported")
+ @unittest.skip("Unreliable in mock")
def test_sensors_temperatures(self):
temps = psutil.sensors_temperatures()
for name, entries in temps.items():

View File

@ -6,7 +6,7 @@
Name: python-%{srcname}
Version: 5.8.0
Release: 1%{?dist}
Release: 2%{?dist}
Summary: %{sum}
License: BSD
@ -17,6 +17,7 @@ Source0: %{url}/archive/release-%{version}/%{srcname}-%{version}.tar.gz
#
Patch0: python-psutil-skip-tests-in-mock.patch
BuildRequires: make
BuildRequires: gcc
BuildRequires: python%{python3_pkgversion}-devel
# Test dependencies
@ -109,6 +110,9 @@ make test CI_TESTING=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sit
%changelog
* Sun Jan 10 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-2
- Disable test_sensors_temperatures test.
* Fri Jan 01 2021 Kevin Fenzi <kevin@scrye.com> - 5.8.0-1
- Update to 5.8.0. Fixes rhbz#1909321
- Re-enable tests (skipping 2 that fail in mock).