Merge branch 'master' of github.com:giampaolo/psutilrelease-5.1.2

3 files changed, 6 insertions, 4 deletions

diff --git a/psutil/_pslinux.py b/psutil/_pslinux.py
index beddb8b6..8fc0bb6d 100644
--- a/psutil/_pslinux.py
+++ b/psutil/_pslinux.py
@@ -1143,8 +1143,8 @@ def sensors_battery():
         except ZeroDivisionError:
             percent = 0.0
     else:
-        percent = int(cat(root + "/capacity", fallback=null))
-        if percent == null:
+        percent = int(cat(root + "/capacity", fallback=-1))
+        if percent == -1:
             return None
 
     # Is AC power cable plugged in?
diff --git a/psutil/tests/__init__.py b/psutil/tests/__init__.py
index b119a788..13c4cfca 100644
--- a/psutil/tests/__init__.py
+++ b/psutil/tests/__init__.py
@@ -199,7 +199,7 @@ def get_test_subprocess(cmd=None, **kwds):
     kwds.setdefault("stdin", DEVNULL)
     kwds.setdefault("stdout", DEVNULL)
     if cmd is None:
-        assert not os.path.exists(_TESTFN)
+        safe_rmpath(_TESTFN)
         pyline = "from time import sleep;"
         pyline += "open(r'%s', 'w').close();" % _TESTFN
         pyline += "sleep(60)"
diff --git a/psutil/tests/test_linux.py b/psutil/tests/test_linux.py
index 3e55d32e..5db4c309 100755
--- a/psutil/tests/test_linux.py
+++ b/psutil/tests/test_linux.py
@@ -1119,13 +1119,15 @@ class TestSensorsBattery(unittest.TestCase):
         def open_mock(name, *args, **kwargs):
             if name.startswith("/sys/class/power_supply/BAT0/energy_full"):
                 raise IOError(errno.ENOENT, "")
+            elif name.startswith("/sys/class/power_supply/BAT0/capacity"):
+                return io.BytesIO(b"88")
             else:
                 return orig_open(name, *args, **kwargs)
 
         orig_open = open
         patch_point = 'builtins.open' if PY3 else '__builtin__.open'
         with mock.patch(patch_point, side_effect=open_mock) as m:
-            self.assertGreaterEqual(psutil.sensors_battery().percent, 0)
+            self.assertEqual(psutil.sensors_battery().percent, 88)
             assert m.called
 
     def test_emulate_no_ac0_online(self):