diff options
Diffstat (limited to 'catapult/common/battor/battor/battor_wrapper_devicetest.py')
| -rw-r--r-- | catapult/common/battor/battor/battor_wrapper_devicetest.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/catapult/common/battor/battor/battor_wrapper_devicetest.py b/catapult/common/battor/battor/battor_wrapper_devicetest.py index 4ca59a79..29c36e7e 100644 --- a/catapult/common/battor/battor/battor_wrapper_devicetest.py +++ b/catapult/common/battor/battor/battor_wrapper_devicetest.py @@ -16,6 +16,7 @@ if __name__ == '__main__': from battor import battor_wrapper from devil.utils import battor_device_mapping from devil.utils import find_usb_devices +import py_utils from py_utils import cloud_storage @@ -23,16 +24,12 @@ _SUPPORTED_CQ_PLATFORMS = ['win', 'linux', 'mac'] class BattOrWrapperDeviceTest(unittest.TestCase): def setUp(self): - test_platform = platform.system() + self._platform = py_utils.GetHostOsName() self._battor_list = None - if 'Win' in test_platform: - self._platform = 'win' - elif 'Linux' in test_platform: - self._platform = 'linux' + + if self._platform == 'linux': device_tree = find_usb_devices.GetBusNumberToDeviceTreeMap() self._battor_list = battor_device_mapping.GetBattOrList(device_tree) - elif 'Darwin' in test_platform: - self._platform = 'mac' if not battor_wrapper.IsBattOrConnected(self._platform): self._battor_list = [] |