update to 5.9.5

python-psutil-skip-tests-in-mock.patch

@@ -1,24 +1,45 @@
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-release-5.8.0/psutil/tests/test_linux.py
+diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_contracts.py psutil-release-5.9.5/psutil/tests/test_contracts.py
---- psutil-release-5.8.0.orig/psutil/tests/test_linux.py	2020-12-18 16:45:00.000000000 -0800
+--- psutil-release-5.9.5.orig/psutil/tests/test_contracts.py	2023-08-04 06:14:41.080097504 -0500
-+++ psutil-release-5.8.0/psutil/tests/test_linux.py	2021-01-10 15:38:31.104890945 -0800
++++ psutil-release-5.9.5/psutil/tests/test_contracts.py	2023-08-04 06:36:02.844609234 -0500
-@@ -261,7 +261,7 @@
+@@ -425,6 +425,7 @@
-         self.assertAlmostEqual(
+                 ls.append(proc_info(pid))
-             vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM)
+             return ls
+ 
++    @unittest.skip("Unreliable in mock")
+     def test_all(self):
+         failures = []
+         for info in self.iter_proc_info():
+diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_linux.py psutil-release-5.9.5/psutil/tests/test_linux.py
+--- psutil-release-5.9.5.orig/psutil/tests/test_linux.py	2023-08-04 06:14:41.080097504 -0500
++++ psutil-release-5.9.5/psutil/tests/test_linux.py	2023-08-04 06:38:25.302472625 -0500
+@@ -257,7 +257,7 @@
+         psutil_value = psutil.virtual_memory().total
+         self.assertEqual(cli_value, psutil_value)
  
 -    @retry_on_failure()
 +    @unittest.skip("Unreliable on mock")
      def test_used(self):
          # Older versions of procps used slab memory to calculate used memory.
          # This got changed in:
-@@ -661,14 +661,13 @@
+@@ -314,6 +314,7 @@
-             value = int(value.split('-')[1]) + 1
+             vmstat_value, psutil_value, delta=TOLERANCE_SYS_MEM)
-             self.assertEqual(psutil.cpu_count(), value)
  
--    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu"),
+     @retry_on_failure()
--                     "/sys/devices/system/cpu does not exist")
++    @unittest.skip("Unreliable in mock")
+     def test_used(self):
+         # Older versions of procps used slab memory to calculate used memory.
+         # This got changed in:
+@@ -691,8 +692,7 @@
+ @unittest.skipIf(not LINUX, "LINUX only")
+ class TestSystemCPUCountLogical(PsutilTestCase):
+ 
+-    @unittest.skipIf(not os.path.exists("/sys/devices/system/cpu/online"),
+-                     "/sys/devices/system/cpu/online does not exist")
 +    @unittest.skip("Unreliable on mock")
-     def test_against_sysdev_cpu_num(self):
+     def test_against_sysdev_cpu_online(self):
-         ls = os.listdir("/sys/devices/system/cpu")
+         with open("/sys/devices/system/cpu/online") as f:
+             value = f.read().strip()
+@@ -707,7 +707,7 @@
          count = len([x for x in ls if re.search(r"cpu\d+$", x) is not None])
          self.assertEqual(psutil.cpu_count(), count)
  
@@ -27,159 +48,99 @@ diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_linux.py psutil-re
      def test_against_nproc(self):
          num = int(sh("nproc --all"))
          self.assertEqual(psutil.cpu_count(logical=True), num)
-@@ -745,7 +744,7 @@
+@@ -752,7 +752,7 @@
+                 assert m.called
+ 
+ 
+-@unittest.skipIf(not LINUX, "LINUX only")
++@unittest.skip("Unreliable on mock")
+ class TestSystemCPUCountCores(PsutilTestCase):
+ 
+     @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
+@@ -784,7 +784,7 @@
  @unittest.skipIf(not LINUX, "LINUX only")
  class TestSystemCPUFrequency(PsutilTestCase):
  
 -    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_emulate_use_second_file(self):
          # https://github.com/giampaolo/psutil/issues/981
          def path_exists_mock(path):
-@@ -759,7 +758,7 @@
+@@ -798,7 +798,7 @@
                          create=True):
              assert psutil.cpu_freq()
  
 -    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_emulate_use_cpuinfo(self):
          # Emulate a case where /sys/devices/system/cpu/cpufreq* does not
          # exist and /proc/cpuinfo is used instead.
-@@ -829,7 +828,7 @@
+@@ -923,7 +923,7 @@
-                 if freq.max != 0.0:
-                     self.assertEqual(freq.max, 700.0)
- 
--    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
-+    @unittest.skip("Unreliable in mock")
-     def test_emulate_multi_cpu(self):
-         def open_mock(name, *args, **kwargs):
-             n = name
-@@ -888,7 +887,7 @@
                      self.assertEqual(freq.current, 200)
  
  
 -@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable in mock")
++@unittest.skip("Unreliable on mock")
  class TestSystemCPUStats(PsutilTestCase):
  
      def test_ctx_switches(self):
-@@ -931,7 +931,7 @@
+@@ -956,7 +956,7 @@
  # =====================================================================
  
  
 -@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable in mock")
++@unittest.skip("Unreliable on mock")
  class TestSystemNetIfAddrs(PsutilTestCase):
  
      def test_ips(self):
-@@ -2126,13 +2125,14 @@
+@@ -1350,7 +1350,7 @@
-         value = tuple(map(int, value.split()[1:4]))
+             self.assertRaises(FileNotFoundError, finder.ask_sys_dev_block)
-         self.assertEqual(self.proc.gids(), value)
- 
--    @retry_on_failure()
-+    @unittest.skip("Unreliable in mock")
-     def test_num_ctx_switches(self):
-         value = self.read_status_file("voluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().voluntary, value)
-         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
- 
-+    @unittest.skip("Unreliable in mock")
-     def test_cpu_affinity(self):
-         value = self.read_status_file("Cpus_allowed_list:")
-         if '-' in str(value):
-diff -uNr psutil-release-5.9.1.orig/psutil/tests/test_linux.py psutil-release-5.9.1/psutil/tests/test_linux.py
---- psutil-release-5.9.1.orig/psutil/tests/test_linux.py        2022-07-31 00:44:02.758574274 -0500
-+++ psutil-release-5.9.1/psutil/tests/test_linux.py     2022-07-31 00:57:10.164798702 -0500
-@@ -727,7 +727,7 @@
-                 m.called
-
-
--@unittest.skipIf(not LINUX, "LINUX only")
-+@unittest.skip("Unreliable in mock")
- class TestSystemCPUCountCores(PsutilTestCase):
-
-     @unittest.skipIf(not which("lscpu"), "lscpu utility not available")
-@@ -1294,6 +1294,7 @@
          finder.ask_sys_class_block()
  
-     @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
+-    @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_comparisons(self):
          finder = RootFsDeviceFinder()
          self.assertIsNotNone(finder.find())
-@@ -1316,11 +1317,13 @@
+@@ -1373,11 +1373,13 @@
  
      @unittest.skipIf(not which("findmnt"), "findmnt utility not available")
      @unittest.skipIf(GITHUB_ACTIONS, "unsupported on GITHUB_ACTIONS")
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_against_findmnt(self):
          psutil_value = RootFsDeviceFinder().find()
          findmnt_value = sh("findmnt -o SOURCE -rn /")
          self.assertEqual(psutil_value, findmnt_value)
  
-+    @unittest.skip("Unreliable in mock")
++    @unittest.skip("Unreliable on mock")
      def test_disk_partitions_mocked(self):
          with mock.patch(
                  'psutil._pslinux.cext.disk_partitions',
-diff --color -Nur psutil-release-5.8.0.orig/psutil/tests/test_system.py psutil-release-5.8.0/psutil/tests/test_system.py
+@@ -1513,6 +1515,7 @@
---- psutil-release-5.8.0.orig/psutil/tests/test_system.py	2020-12-18 16:45:00.000000000 -0800
+                 psutil._pslinux.boot_time)
-+++ psutil-release-5.8.0/psutil/tests/test_system.py	2021-01-10 15:38:31.105890946 -0800
+             assert m.called
-@@ -198,7 +198,7 @@
-         self.assertGreater(bt, 0)
-         self.assertLess(bt, time.time())
  
--    @unittest.skipIf(CI_TESTING and not psutil.users(), "unreliable on CI")
++    @unittest.skip("Unreliable on mock")
-+    @unittest.skipIf(not psutil.users(), "unreliable on CI")
+     def test_users_mocked(self):
-     def test_users(self):
+         # Make sure ':0' and ':0.0' (returned by C ext) are converted
-         users = psutil.users()
+         # to 'localhost'.
-         self.assertNotEqual(users, [])
+@@ -2275,6 +2278,7 @@
-@@ -510,7 +510,7 @@
+         value = self.read_status_file("nonvoluntary_ctxt_switches:")
-             if not AIX and name in ('ctx_switches', 'interrupts'):
+         self.assertEqual(self.proc.num_ctx_switches().involuntary, value)
-                 self.assertGreater(value, 0)
  
--    @unittest.skipIf(not HAS_CPU_FREQ, "not supported")
++    @unittest.skip("Unreliable on mock")
-+    @unittest.skip("Unreliable in mock")
+     def test_cpu_affinity(self):
-     def test_cpu_freq(self):
+         value = self.read_status_file("Cpus_allowed_list:")
-         def check_ls(ls):
+         if '-' in str(value):
-             for nt in ls:
+diff -uNr psutil-release-5.9.5.orig/psutil/tests/test_testutils.py psutil-release-5.9.5/psutil/tests/test_testutils.py
-@@ -579,6 +579,7 @@
+--- psutil-release-5.9.5.orig/psutil/tests/test_testutils.py	2023-08-04 06:14:41.080097504 -0500
-     def test_disk_usage_bytes(self):
++++ psutil-release-5.9.5/psutil/tests/test_testutils.py	2023-08-04 06:35:41.421931668 -0500
-         psutil.disk_usage(b'.')
+@@ -370,7 +370,7 @@
- 
-+    @unittest.skip("unreliable on CI")
-     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():
-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")
+     @unittest.skipIf(COVERAGE, "skipped during test coverage")
      def test_leak_mem(self):
          ls = []
-
-diff -uNr psutil-release-5.9.1.orig/psutil/tests/test_contracts.py psutil-release-5.9.1/psutil/tests/test_contracts.py
---- psutil-release-5.9.1.orig/psutil/tests/test_contracts.py    2022-07-31 00:44:02.758574274 -0500
-+++ psutil-release-5.9.1/psutil/tests/test_contracts.py 2022-08-01 18:13:07.225928037 -0500
-@@ -409,6 +409,7 @@
-         from psutil.tests.test_contracts import proc_info
-         return self.pool.imap_unordered(proc_info, psutil.pids())
-
-+    @unittest.skip("Unreliable in mock")
-     def test_all(self):
-         failures = []
-         for info in self.iter_proc_info():

python-psutil.spec

@@ -2,8 +2,8 @@
 %global sum A process and system utilities module for Python
 
 Name:           python-%{srcname}
-Version:        5.9.2
+Version:        5.9.5
-Release:        4%{?dist}
+Release:        1%{?dist}
 Summary:        %{sum}
 
 License:        BSD
@@ -95,6 +95,10 @@ make test APPVEYOR=1 PYTHON=%{__python3} PYTHONPATH=%{buildroot}/%{python3_sitea
 
 
 %changelog
+* Fri Aug 04 2023 Jonathan Wright <jonathan@almalinux.org> - 5.9.5-1
+- Update to 5.9.5 rhbz#2135931
+- Skip unreliable test rhbz#2169395
+
 * Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 5.9.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (psutil-5.9.2.tar.gz) = 25e93a5e146fdcfda4b5372bb7f6a0014529cae13579d0e1eb01d4df445155a2bd4c9ab61a6ea9667684bd4e7994b8899ab4dd28ed1ea928b687079bc7aa6d5e
+SHA512 (psutil-5.9.5.tar.gz) = b9872acbecd1d9a9a79f032bd375ff0f10be4574e5f76f904c7a6367d7d3e24e7f0a1d06affa2fafbea74ecb594017029bdf29fdb8a8d37aeb51fb0016c3339c