From ff088dc310f0cd24509ab4260888ef75da412ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 13 Aug 2020 16:00:19 +0200 Subject: If the batery is not available set it to false (#1717) --- psutil/tests/__init__.py | 2 +- psutil/tests/test_misc.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index a21f1fd8..b508a629 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -185,7 +185,7 @@ HAS_SENSORS_BATTERY = hasattr(psutil, "sensors_battery") try: HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery()) except Exception: - HAS_BATTERY = True + HAS_BATTERY = False HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans") HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures") HAS_THREADS = hasattr(psutil.Process, "threads") diff --git a/psutil/tests/test_misc.py b/psutil/tests/test_misc.py index 10e45d23..8fcee12a 100755 --- a/psutil/tests/test_misc.py +++ b/psutil/tests/test_misc.py @@ -763,6 +763,8 @@ class TestScripts(PsutilTestCase): def test_battery(self): self.assert_stdout('battery.py') + @unittest.skipIf(not HAS_SENSORS_BATTERY, "not supported") + @unittest.skipIf(not HAS_BATTERY, "no battery") def test_sensors(self): self.assert_stdout('sensors.py') -- cgit v1.2.1