Index: build/android/pylib/remote/device/remote_device_gtest_run.py |
diff --git a/build/android/pylib/remote/device/remote_device_gtest_run.py b/build/android/pylib/remote/device/remote_device_gtest_run.py |
index d40263db151d1be9ab96a0a7f8d15a1943d1cb21..fb2d507e9445b3e28c9568a46fa3c42d1ac58e11 100644 |
--- a/build/android/pylib/remote/device/remote_device_gtest_run.py |
+++ b/build/android/pylib/remote/device/remote_device_gtest_run.py |
@@ -30,7 +30,6 @@ class RemoteDeviceGtestRun(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) |
if not self._env.runner_type: |
runner_type = self.DEFAULT_RUNNER_TYPE |
@@ -45,9 +44,13 @@ class RemoteDeviceGtestRun(remote_device_test_run.RemoteDeviceTestRun): |
else: |
runner_package = self._env.runner_package |
- self._test_id = self._UploadTestToDevice(runner_type) |
- config_body = {'runner': runner_package} |
- self._SetTestConfig(runner_type, config_body) |
+ if runner_type == 'robotium': |
klundberg
2015/01/06 18:17:31
Similar comment about using "robotium" here. Seems
jbudorick
2015/01/06 18:25:57
The implementation _is_ specific to "robotium" tes
|
+ dummy_app_path = os.path.join( |
+ constants.GetOutDirectory(), 'apks', 'remote_device_dummy.apk') |
+ self._RobotiumSetup(dummy_app_path, self._test_instance.apk, |
+ runner_package) |
+ else: |
+ raise Exception('unsupported runner_type: %s' % runner_type) |
_INSTRUMENTATION_STREAM_LEADER = 'INSTRUMENTATION_STATUS: stream=' |