diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-26 01:37:17 +0100 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2019-02-26 01:37:17 +0100 |
commit | d912cd584f354c2e660c3331ab63fd8e53c1ecf0 (patch) | |
tree | 4f7b36c378aad39d89b970a8d879eab6b2271d2b | |
parent | af4e8353def6eba3dc1d6920d1238765ceaec317 (diff) | |
download | psutil-d912cd584f354c2e660c3331ab63fd8e53c1ecf0.tar.gz |
fix #1414: linux test failure because of sensors_batter() exc on import
-rw-r--r-- | psutil/tests/__init__.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py index fac9083b..b6f76a29 100644 --- a/psutil/tests/__init__.py +++ b/psutil/tests/__init__.py @@ -172,7 +172,10 @@ HAS_PROC_CPU_NUM = hasattr(psutil.Process, "cpu_num") HAS_RLIMIT = hasattr(psutil.Process, "rlimit") HAS_THREADS = hasattr(psutil.Process, "threads") HAS_SENSORS_BATTERY = hasattr(psutil, "sensors_battery") -HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery()) +try: + HAS_BATTERY = HAS_SENSORS_BATTERY and bool(psutil.sensors_battery()) +except Exception: + HAS_BATTERY = True HAS_SENSORS_FANS = hasattr(psutil, "sensors_fans") HAS_SENSORS_TEMPERATURES = hasattr(psutil, "sensors_temperatures") |