avoid raising the result of pytest.skip/pytest.fail (#2638)

Author: elisw93

psutil/tests/__init__.py

@@ -946,7 +946,7 @@ def create_c_exe(path, c_code=None):
     """Create a compiled C executable in the given location."""
     assert not os.path.exists(path), path
     if not shutil.which("gcc"):
-        raise pytest.skip("gcc is not installed")
+        return pytest.skip("gcc is not installed")
     if c_code is None:
         c_code = textwrap.dedent("""
             #include <unistd.h>
@@ -1060,7 +1060,7 @@ def assert_pid_gone(self, pid):
             try:
                 psutil.Process(pid)
             except psutil.ZombieProcess:
-                raise pytest.fail("wasn't supposed to raise ZombieProcess")
+                return pytest.fail("wasn't supposed to raise ZombieProcess")
         assert cm.value.pid == pid
         assert cm.value.name is None
         assert not psutil.pid_exists(pid), pid
@@ -1233,13 +1233,13 @@ def _check_fds(self, fun):
                 f"negative diff {diff!r} (gc probably collected a"
                 " resource from a previous test)"
             )
-            raise pytest.fail(msg)
+            return pytest.fail(msg)
         if diff > 0:
             type_ = "fd" if POSIX else "handle"
             if diff > 1:
                 type_ += "s"
             msg = f"{diff} unclosed {type_} after calling {fun!r}"
-            raise pytest.fail(msg)
+            return pytest.fail(msg)
 
     def _call_ntimes(self, fun, times):
         """Get 2 distinct memory samples, before and after having
@@ -1273,14 +1273,14 @@ def _check_mem(self, fun, times, retries, tolerance):
             if success:
                 if idx > 1:
                     self._log(msg)
-                return
+                return None
             else:
                 if idx == 1:
                     print()  # noqa: T201
                 self._log(msg)
                 times += increase
                 prev_mem = mem
-        raise pytest.fail(". ".join(messages))
+        return pytest.fail(". ".join(messages))
 
     # ---
 
@@ -1320,7 +1320,7 @@ def call():
             except exc:
                 pass
             else:
-                raise pytest.fail(f"{fun} did not raise {exc}")
+                return pytest.fail(f"{fun} did not raise {exc}")
 
         self.execute(call, **kwargs)
 
@@ -1587,7 +1587,7 @@ def wrapper(*args, **kwargs):
                 if only_if is not None:
                     if not only_if:
                         raise
-                raise pytest.skip("raises AccessDenied")
+                return pytest.skip("raises AccessDenied")
 
         return wrapper
 
@@ -1610,7 +1610,7 @@ def wrapper(*args, **kwargs):
                     f"{fun.__name__!r} was skipped because it raised"
                     " NotImplementedError"
                 )
-                raise pytest.skip(msg)
+                return pytest.skip(msg)
 
         return wrapper
 

psutil/tests/test_bsd.py

@@ -116,9 +116,9 @@ def df(path):
             assert usage.total == total
             # 10 MB tolerance
             if abs(usage.free - free) > 10 * 1024 * 1024:
-                raise pytest.fail(f"psutil={usage.free}, df={free}")
+                return pytest.fail(f"psutil={usage.free}, df={free}")
             if abs(usage.used - used) > 10 * 1024 * 1024:
-                raise pytest.fail(f"psutil={usage.used}, df={used}")
+                return pytest.fail(f"psutil={usage.used}, df={used}")
 
     @pytest.mark.skipif(
         not shutil.which("sysctl"), reason="sysctl cmd not available"
@@ -268,7 +268,7 @@ def test_cpu_frequency_against_sysctl(self):
         try:
             sysctl_result = int(sysctl(sensor))
         except RuntimeError:
-            raise pytest.skip("frequencies not supported by kernel")
+            return pytest.skip("frequencies not supported by kernel")
         assert psutil.cpu_freq().current == sysctl_result
 
         sensor = "dev.cpu.0.freq_levels"
@@ -466,7 +466,7 @@ def test_sensors_temperatures_against_sysctl(self):
             try:
                 sysctl_result = int(float(sysctl(sensor)[:-1]))
             except RuntimeError:
-                raise pytest.skip("temperatures not supported by kernel")
+                return pytest.skip("temperatures not supported by kernel")
             assert (
                 abs(
                     psutil.sensors_temperatures()["coretemp"][cpu].current

psutil/tests/test_contracts.py

@@ -226,7 +226,7 @@ def test_cpu_count(self):
     @pytest.mark.skipif(not HAS_CPU_FREQ, reason="not supported")
     def test_cpu_freq(self):
         if psutil.cpu_freq() is None:
-            raise pytest.skip("cpu_freq() returns None")
+            return pytest.skip("cpu_freq() returns None")
         self.assert_ntuple_of_nums(psutil.cpu_freq(), type_=(float, int))
 
     def test_disk_io_counters(self):

psutil/tests/test_linux.py

@@ -178,7 +178,7 @@ def vmstat(stat):
 def get_free_version_info():
     out = sh(["free", "-V"]).strip()
     if 'UNKNOWN' in out:
-        raise pytest.skip("can't determine free version")
+        return pytest.skip("can't determine free version")
     return tuple(map(int, re.findall(r'\d+', out.split()[-1])))
 
 
@@ -237,12 +237,12 @@ def test_used(self):
         # This got changed in:
         # https://gitlab.com/procps-ng/procps/commit/
         #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-        # Newer versions of procps are using yet another way to compute used
-        # memory.
+        # Newer versions of procps (>=4.0.1) are using yet another way to
+        # compute used memory.
         # https://gitlab.com/procps-ng/procps/commit/
         #     2184e90d2e7cdb582f9a5b706b47015e56707e4d
-        if get_free_version_info() < (4, 0, 0):
-            raise pytest.skip("free version too old")
+        if get_free_version_info() < (4, 0, 1):
+            return pytest.skip("free version too old")
         cli_value = free_physmem().used
         psutil_value = psutil.virtual_memory().used
         assert abs(cli_value - psutil_value) < TOLERANCE_SYS_MEM
@@ -258,7 +258,7 @@ def test_shared(self):
         free = free_physmem()
         free_value = free.shared
         if free_value == 0:
-            raise pytest.skip("free does not support 'shared' column")
+            return pytest.skip("free does not support 'shared' column")
         psutil_value = psutil.virtual_memory().shared
         assert (
             abs(free_value - psutil_value) < TOLERANCE_SYS_MEM
@@ -271,7 +271,7 @@ def test_available(self):
         out = sh(["free", "-b"])
         lines = out.split('\n')
         if 'available' not in lines[0]:
-            raise pytest.skip("free does not support 'available' column")
+            return pytest.skip("free does not support 'available' column")
         free_value = int(lines[1].split()[-1])
         psutil_value = psutil.virtual_memory().available
         assert abs(free_value - psutil_value) < TOLERANCE_SYS_MEM
@@ -290,12 +290,12 @@ def test_used(self):
         # This got changed in:
         # https://gitlab.com/procps-ng/procps/commit/
         #     05d751c4f076a2f0118b914c5e51cfbb4762ad8e
-        # Newer versions of procps are using yet another way to compute used
-        # memory.
+        # Newer versions of procps (>=4.0.1) are using yet another way to
+        # compute used memory.
         # https://gitlab.com/procps-ng/procps/commit/
         #     2184e90d2e7cdb582f9a5b706b47015e56707e4d
-        if get_free_version_info() < (4, 0, 0):
-            raise pytest.skip("free version too old")
+        if get_free_version_info() < (4, 0, 1):
+            return pytest.skip("free version too old")
         vmstat_value = vmstat('used memory') * 1024
         psutil_value = psutil.virtual_memory().used
         assert abs(vmstat_value - psutil_value) < TOLERANCE_SYS_MEM
@@ -595,7 +595,7 @@ def test_meminfo_against_sysinfo(self):
         # matches sysinfo() syscall, see:
         # https://github.com/giampaolo/psutil/issues/1015
         if not self.meminfo_has_swap_info():
-            raise pytest.skip("/proc/meminfo has no swap metrics")
+            return pytest.skip("/proc/meminfo has no swap metrics")
         with mock.patch('psutil._pslinux.cext.linux_sysinfo') as m:
             swap = psutil.swap_memory()
         assert not m.called
@@ -1028,7 +1028,7 @@ def test_flags(self):
                         assert ifconfig_flags == psutil_flags
 
         if not matches_found:
-            raise pytest.fail("no matches were found")
+            return pytest.fail("no matches were found")
 
 
 @pytest.mark.skipif(not LINUX, reason="LINUX only")

psutil/tests/test_misc.py

@@ -216,7 +216,7 @@ def test__all__(self):
                             fun.__doc__ is not None
                             and 'deprecated' not in fun.__doc__.lower()
                         ):
-                            raise pytest.fail(
+                            return pytest.fail(
                                 f"{name!r} not in psutil.__all__"
                             )
 
@@ -847,7 +847,7 @@ def test_cache_clear(self):
     @pytest.mark.skipif(not HAS_NET_IO_COUNTERS, reason="not supported")
     def test_cache_clear_public_apis(self):
         if not psutil.disk_io_counters() or not psutil.net_io_counters():
-            raise pytest.skip("no disks or NICs available")
+            return pytest.skip("no disks or NICs available")
         psutil.disk_io_counters()
         psutil.net_io_counters()
         caches = wrap_numbers.cache_info()

psutil/tests/test_posix.py

@@ -133,7 +133,7 @@ def df(device):
         out = sh(f"df -k {device}").strip()
     except RuntimeError as err:
         if "device busy" in str(err).lower():
-            raise pytest.skip("df returned EBUSY")
+            return pytest.skip("df returned EBUSY")
         raise
     line = out.split('\n')[1]
     fields = line.split()
@@ -337,7 +337,7 @@ def test_pids(self):
             difference = [x for x in pids_psutil if x not in pids_ps] + [
                 x for x in pids_ps if x not in pids_psutil
             ]
-            raise pytest.fail("difference: " + str(difference))
+            return pytest.fail("difference: " + str(difference))
 
     # for some reason ifconfig -a does not report all interfaces
     # returned by psutil
@@ -351,7 +351,7 @@ def test_nic_names(self):
                 if line.startswith(nic):
                     break
             else:
-                raise pytest.fail(
+                return pytest.fail(
                     f"couldn't find {nic} nic in 'ifconfig -a'"
                     f" output\n{output}"
                 )
@@ -360,7 +360,7 @@ def test_nic_names(self):
     def test_users(self):
         out = sh("who -u")
         if not out.strip():
-            raise pytest.skip("no users on this system")
+            return pytest.skip("no users on this system")
 
         susers = []
         for line in out.splitlines():
@@ -391,7 +391,7 @@ def test_users(self):
     def test_users_started(self):
         out = sh("who -u")
         if not out.strip():
-            raise pytest.skip("no users on this system")
+            return pytest.skip("no users on this system")
         tstamp = None
         # '2023-04-11 09:31' (Linux)
         started = re.findall(r"\d\d\d\d-\d\d-\d\d \d\d:\d\d", out)
@@ -415,7 +415,7 @@ def test_users_started(self):
                         started = [x.capitalize() for x in started]
 
         if not tstamp:
-            raise pytest.skip(f"cannot interpret tstamp in who output\n{out}")
+            return pytest.skip(f"cannot interpret tstamp in who output\n{out}")
 
         with self.subTest(psutil=psutil.users(), who=out):
             for idx, u in enumerate(psutil.users()):