diff options
author | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-02 04:43:00 +0200 |
---|---|---|
committer | Giampaolo Rodola <g.rodola@gmail.com> | 2017-05-02 04:43:00 +0200 |
commit | b47f72620fe547e53ff7ab1247509d07b586e39f (patch) | |
tree | b8e775c537f28efd67ceda169e0daf525ff43945 | |
parent | ad579702c39bbe5d3c1f6d1c0b3f3091399e8e49 (diff) | |
download | psutil-b47f72620fe547e53ff7ab1247509d07b586e39f.tar.gz |
windows: remove dupe test to check if there's a battery
-rwxr-xr-x | psutil/tests/test_windows.py | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/psutil/tests/test_windows.py b/psutil/tests/test_windows.py index 677df34d..2a883132 100755 --- a/psutil/tests/test_windows.py +++ b/psutil/tests/test_windows.py @@ -190,10 +190,10 @@ class TestSystemAPIs(unittest.TestCase): class TestSensorsBattery(unittest.TestCase): def test_has_battery(self): - if psutil.sensors_battery() is None: - w = wmi.WMI() - with self.assertRaises(IndexError): - w.query('select * from Win32_Battery')[0] + if win32api.GetPwrCapabilities()['SystemBatteriesPresent']: + self.assertIsNotNone(psutil.sensors_battery()) + else: + self.assertIsNone(psutil.sensors_battery()) @unittest.skipIf(not HAS_BATTERY, "no battery") def test_percent(self): @@ -214,12 +214,6 @@ class TestSensorsBattery(unittest.TestCase): self.assertEqual(battery_psutil.power_plugged, battery_wmi.BatteryStatus == 2) - def test_battery_present(self): - if win32api.GetPwrCapabilities()['SystemBatteriesPresent']: - self.assertIsNotNone(psutil.sensors_battery()) - else: - self.assertIsNone(psutil.sensors_battery()) - def test_emulate_no_battery(self): with mock.patch("psutil._pswindows.cext.sensors_battery", return_value=(0, 128, 0, 0)) as m: |