summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomáš Chvátal <tomas.chvatal@gmail.com>2020-08-13 16:00:19 +0200
committerGitHub <noreply@github.com>2020-08-13 16:00:19 +0200
commitff088dc310f0cd24509ab4260888ef75da412ed3 (patch)
tree7977417c510b4c9d5a88ec719b046a3b2524574b
parent6b6f98b3d0926901c0929a377dfd2680b93661c9 (diff)
downloadpsutil-ff088dc310f0cd24509ab4260888ef75da412ed3.tar.gz
If the batery is not available set it to false (#1717)
-rw-r--r--psutil/tests/__init__.py2
-rwxr-xr-xpsutil/tests/test_misc.py2
2 files changed, 3 insertions, 1 deletions
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')