Add Instrumentation test support to remote device

build/android/pylib/remote/device/remote_device_test_run.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Run specific test on specific environment."""
 
 import json
 import logging
 import os
 import sys
@@ skipping 201 matching lines @@
           for h, _ in data_deps:
             if os.path.isdir(h):
               zip_utils.WriteToZipFile(zip_file, h, '.')
               sdcard_files.extend(os.listdir(h))
             else:
               zip_utils.WriteToZipFile(zip_file, h, os.path.basename(h))
               sdcard_files.append(os.path.basename(h))
         config['sdcard_files'] = ','.join(sdcard_files)
         config['host_test'] = host_test
         self._test_id = self._UploadTestToDevice(
-            'robotium', test_with_deps.name)
+            'robotium', test_with_deps.name, app_id=self._app_id)
     else:
       self._test_id = self._UploadTestToDevice('robotium', test_path)
 
     logging.info('Setting config: %s' % config)
     self._SetTestConfig('robotium', config)
 
   def _UploadAppToDevice(self, app_path):
     """Upload app to device."""
     logging.info('Uploading %s to remote service.', app_path)
     with open(app_path, 'rb') as apk_src:
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         upload_results = appurify_sanitized.api.apps_upload(
             self._env.token, apk_src, 'raw', name=self._test_instance.suite)
       remote_device_helper.TestHttpResponse(
           upload_results, 'Unable to upload %s.' % app_path)
       return upload_results.json()['response']['app_id']
 
-  def _UploadTestToDevice(self, test_type, test_path):
+  def _UploadTestToDevice(self, test_type, test_path, app_id=None):
     """Upload test to device
     Args:
       test_type: Type of test that is being uploaded. Ex. uirobot, gtest..
     """
     logging.info('Uploading %s to remote service.' % test_path)
     with open(test_path, 'rb') as test_src:
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         upload_results = appurify_sanitized.api.tests_upload(
-            self._env.token, test_src, 'raw', test_type)
+            self._env.token, test_src, 'raw', test_type, app_id=app_id)
       remote_device_helper.TestHttpResponse(upload_results,
           'Unable to upload %s.' % test_path)
       return upload_results.json()['response']['test_id']
 
   def _SetTestConfig(self, runner_type, body):
     """Generates and uploads config file for test.
     Args:
       extras: Extra arguments to set in the config file.
     """
     logging.info('Generating config file for test.')
     with tempfile.TemporaryFile() as config:
       config_data = [
         '[appurify]',
         'pcap=0',
         'profiler=0',
         'videocapture=0',
         '[%s]' % runner_type
       ]
       config_data.extend('%s=%s' % (k, v) for k, v in body.iteritems())
       config.write(''.join('%s\n' % l for l in config_data))
       config.flush()
       config.seek(0)
       with appurify_sanitized.SanitizeLogging(self._env.verbose_count,
                                               logging.WARNING):
         config_response = appurify_sanitized.api.config_upload(
             self._env.token, config, self._test_id)
       remote_device_helper.TestHttpResponse(
           config_response, 'Unable to upload test config.')