Chromium Code Reviews| Index: build/android/pylib/remote/device/remote_device_uirobot_test_run.py |
| diff --git a/build/android/pylib/remote/device/remote_device_uirobot_test_run.py b/build/android/pylib/remote/device/remote_device_uirobot_test_run.py |
| index 7eedaa5b9d0ecf69d9a9153e10b63b925ca20253..7c8225a569e9970eb4fa2130b25991dc0bf74c81 100644 |
| --- a/build/android/pylib/remote/device/remote_device_uirobot_test_run.py |
| +++ b/build/android/pylib/remote/device/remote_device_uirobot_test_run.py |
| @@ -18,7 +18,6 @@ from pylib.remote.device import remote_device_helper |
| class RemoteDeviceUirobotTestRun(remote_device_test_run.RemoteDeviceTestRun): |
| """Run uirobot tests on a remote device.""" |
| - DEFAULT_RUNNER_TYPE = 'android_robot' |
| def __init__(self, env, test_instance): |
| """Constructor. |
| @@ -37,10 +36,19 @@ class RemoteDeviceUirobotTestRun(remote_device_test_run.RemoteDeviceTestRun): |
| def _TriggerSetUp(self): |
| """Set up the triggering of a test run.""" |
| logging.info('Triggering test run.') |
| - self._app_id = self._UploadAppToDevice(self._test_instance.apk_under_test) |
| + |
| + if self._env.device_type == 'Android': |
| + default_runner_type = 'android_robot' |
| + elif self._env.device_type == 'iOS': |
| + default_runner_type = 'ios_robot' |
| + else: |
| + raise remote_device_helper.RemoteDeviceError( |
| + 'Unkown device type: %s' % self._env.device_type) |
|
jbudorick
2015/01/22 22:01:05
nit: only a 4 space indent here
rnephew (Wrong account)
2015/01/22 22:02:56
Done.
|
| + |
| + self._app_id = self._UploadAppToDevice(self._test_instance.app_under_test) |
| if not self._env.runner_type: |
| - runner_type = self.DEFAULT_RUNNER_TYPE |
| - logging.info('Using default runner type: %s', self.DEFAULT_RUNNER_TYPE) |
| + runner_type = default_runner_type |
| + logging.info('Using default runner type: %s', default_runner_type) |
| else: |
| runner_type = self._env.runner_type |
| self._test_id = self._GetTestByName(runner_type) |