Skip unreliable multi-cpu test on ppc64le

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This commit is contained in:
Stephen Gallagher 2024-02-14 18:22:16 -05:00
parent c8d6eb87da
commit 99227cb8c6
3 changed files with 42 additions and 24 deletions

View File

@ -1,21 +0,0 @@
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 1096d3c..a9cc7ba 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -14,6 +14,7 @@ import errno
import glob
import io
import os
+import platform
import re
import shutil
import socket
@@ -884,6 +885,8 @@ class TestSystemCPUFrequency(PsutilTestCase):
self.assertEqual(freq.max, 700.0)
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
+ @unittest.skipIf(platform.machine() == "aarch64",
+ "https://github.com/giampaolo/psutil/issues/2373")
def test_emulate_multi_cpu(self):
def open_mock(name, *args, **kwargs):
n = name

View File

@ -0,0 +1,36 @@
From 35d3054307a6f2e607026101e6f0b19b6c472864 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Wed, 14 Feb 2024 18:14:08 -0500
Subject: [PATCH] Skip on aarch64 and ppc64le
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
---
psutil/tests/test_linux.py | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 0583e619de59931a9ee80411a95ef8eb7ef6c171..7f6cfd5431086b108c1a7fa140b407cc9b6b0836 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -14,6 +14,7 @@ import errno
import glob
import io
import os
+import platform
import re
import shutil
import socket
@@ -888,6 +889,10 @@ class TestSystemCPUFrequency(PsutilTestCase):
self.assertEqual(freq.max, 700.0)
@unittest.skipIf(not HAS_CPU_FREQ, "not supported")
+ @unittest.skipIf(platform.machine() == "aarch64",
+ "https://github.com/giampaolo/psutil/issues/2373")
+ @unittest.skipIf(platform.machine() == "ppc64le",
+ "https://github.com/giampaolo/psutil/issues/2373")
def test_emulate_multi_cpu(self):
def open_mock(name, *args, **kwargs):
n = name
--
2.43.0

View File

@ -1,6 +1,6 @@
Name: python-psutil Name: python-psutil
Version: 5.9.8 Version: 5.9.8
Release: 1%{?dist} Release: 2%{?dist}
Summary: A process and system utilities module for Python Summary: A process and system utilities module for Python
License: BSD-3-Clause License: BSD-3-Clause
@ -15,10 +15,10 @@ Patch: python-psutil-skip-tests-in-mock.patch
# #
Patch: https://github.com/giampaolo/psutil/pull/2372.patch Patch: https://github.com/giampaolo/psutil/pull/2372.patch
# #
# Skip test_emulate_multi_cpu on aarch64 # Skip test_emulate_multi_cpu on aarch64 and ppc64le
# Failure reported upstream: https://github.com/giampaolo/psutil/issues/2373 # Failure reported upstream: https://github.com/giampaolo/psutil/issues/2373
# #
Patch: python-psutil-skip-test_emulate_multi_cpu-on-aarch64.patch Patch: python-psutil-skip-test_emulate_multi_cpu.patch
# #
# Skip test_misc.TestCommonModule.test_debug # Skip test_misc.TestCommonModule.test_debug
# Failure reported upstream: https://github.com/giampaolo/psutil/issues/2374 # Failure reported upstream: https://github.com/giampaolo/psutil/issues/2374
@ -106,6 +106,9 @@ APPVEYOR=1 %{py3_test_envvars} %{python3} psutil/tests/runner.py
%changelog %changelog
* Wed Feb 14 2024 Stephen Gallagher <sgallagh@redhat.com> - 5.9.8-2
- Skip unreliable multi-cpu test on ppc64le
* Fri Feb 09 2024 Miro Hrončok <mhroncok@redhat.com> - 5.9.8-1 * Fri Feb 09 2024 Miro Hrončok <mhroncok@redhat.com> - 5.9.8-1
- Update to 5.9.8 - Update to 5.9.8
- Fixes: rhbz#2244271 - Fixes: rhbz#2244271