summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGiampaolo Rodola <g.rodola@gmail.com>2017-10-30 00:06:08 +0100
committerGiampaolo Rodola <g.rodola@gmail.com>2017-10-30 00:06:08 +0100
commit04087b9f0e182dc5bbd36c42f295888a408c6c00 (patch)
treee80675bc990b7665ac93d1b7c99df52d4c5502c7
parentb30bef830aaa0adb0f3904ed805aa3174aaa2d49 (diff)
parentfe53d1a582a8174204ae08b5e301a3dcfdf09901 (diff)
downloadpsutil-04087b9f0e182dc5bbd36c42f295888a408c6c00.tar.gz
Merge branch 'master' of github.com:giampaolo/psutil
-rwxr-xr-xpsutil/tests/test_linux.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 7bb37a8d..4658dd21 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -1326,7 +1326,9 @@ class TestSensorsBattery(unittest.TestCase):
# Emulate a case where energy_full file does not exist.
# Expected fallback on /capacity.
def open_mock(name, *args, **kwargs):
- if name.startswith("/sys/class/power_supply/BAT0/energy_full"):
+ energy_full = "/sys/class/power_supply/BAT0/energy_full"
+ charge_full = "/sys/class/power_supply/BAT0/charge_full"
+ if name.startswith(energy_full) or name.startswith(charge_full):
raise IOError(errno.ENOENT, "")
elif name.startswith("/sys/class/power_supply/BAT0/capacity"):
return io.BytesIO(b"88")