[android] Instumentation tests determine whether to install test apk based on Md5Sum.

build/android/pylib/instrumentation/test_runner.py

 # Copyright (c) 2012 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.
 
 """Class for running instrumentation tests on a single device."""
 
 import logging
 import os
 import re
 import shutil
@@ skipping 40 matching lines @@
   _DEVICE_PERF_OUTPUT_SEARCH_PREFIX = (constants.DEVICE_PERF_OUTPUT_DIR +
                                        '/chrome-profile*')
   _DEVICE_HAS_TEST_FILES = {}
 
   def __init__(self, options, device, shard_index, test_pkg, ports_to_forward):
     """Create a new TestRunner.
 
     Args:
       options: An options object with the following required attributes:
       -  build_type: 'Release' or 'Debug'.
-      -  install_apk: Re-installs the apk if opted.
       -  save_perf_json: Whether or not to save the JSON file from UI perf
             tests.
       -  screenshot_failures: Take a screenshot for a test failure
       -  tool: Name of the Valgrind tool.
       -  wait_for_debugger: blocks until the debugger is connected.
       -  disable_assertions: Whether to disable java assertions on the device.
       -  push_deps: If True, push all dependencies to the device.
       -  cleanup_test_files: Whether or not to cleanup test files on device.
       device: Attached android device.
       shard_index: Shard index.
       test_pkg: A TestPackage object.
       ports_to_forward: A list of port numbers for which to set up forwarders.
                         Can be optionally requested by a test case.
     """
     super(TestRunner, self).__init__(
         device, options.tool, options.build_type, options.push_deps,
         options.cleanup_test_files)
     self._lighttp_port = constants.LIGHTTPD_RANDOM_PORT_FIRST + shard_index
 
     self.build_type = options.build_type
     self.test_data = options.test_data
     self.save_perf_json = options.save_perf_json
     self.screenshot_failures = options.screenshot_failures
     self.wait_for_debugger = options.wait_for_debugger
     self.disable_assertions = options.disable_assertions
     self.test_pkg = test_pkg
     self.ports_to_forward = ports_to_forward
-    self.install_apk = options.install_apk

[frankf, 2013/07/20 02:18:35]

Rebase

[craigdh, 2013/07/22 19:03:14]

Done.

 
   #override
   def InstallTestPackage(self):
-    if self.install_apk:
-      self.test_pkg.Install(self.adb)
+    self.test_pkg.Install(self.adb)
 
   #override
   def PushDataDeps(self):
     # TODO(frankf): Implement a general approach for copying/installing
     # once across test runners.
     if TestRunner._DEVICE_HAS_TEST_FILES.get(self.device, False):
       logging.warning('Already copied test files to device %s, skipping.',
                       self.device)
       return
 
@@ skipping 246 matching lines @@
         duration_ms = 0
       message = str(e)
       if not message:
         message = 'No information.'
       results.AddResult(test_result.InstrumentationTestResult(
           test, base_test_result.ResultType.CRASH, start_date_ms, duration_ms,
           log=message))
       raw_result = None
     self.TestTeardown(test, raw_result)
     return (results, None if results.DidRunPass() else test)