diff options
| author | Giampaolo Rodola <g.rodola@gmail.com> | 2020-08-15 10:46:58 +0200 |
|---|---|---|
| committer | Giampaolo Rodola <g.rodola@gmail.com> | 2020-08-15 10:46:58 +0200 |
| commit | ee60bad610822a7f630c52922b4918e684ba7695 (patch) | |
| tree | 808906b8eafe367d3fc22b45a1db9fe26737429d | |
| parent | c7ded0124e7b51da4f135ded3d105b22bf0d98f2 (diff) | |
| parent | ff088dc310f0cd24509ab4260888ef75da412ed3 (diff) | |
| download | psutil-ee60bad610822a7f630c52922b4918e684ba7695.tar.gz | |
Merge branch 'master' of github.com:giampaolo/psutil
| -rw-r--r-- | psutil/tests/__init__.py | 2 | ||||
| -rwxr-xr-x | psutil/tests/test_misc.py | 2 |
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') |