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

build/android/pylib/instrumentation/test_package.py

 # Copyright (c) 2013 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 representing instrumentation test apk and jar."""
 
 import os
 
 from pylib.utils import apk_helper
 
 import test_jar
 
 
+def _rreplace(s, old, new, occurrence=1):

[frankf, 2013/07/22 20:27:04]

Name style issue

[craigdh, 2013/07/22 23:50:25]

Done.

+  li = s.rsplit(old, occurrence)
+  return new.join(li)
+

[frankf, 2013/07/22 20:27:04]

2 Blank lines

[craigdh, 2013/07/22 23:50:25]

Done.

 class TestPackage(test_jar.TestJar):
   def __init__(self, apk_path, jar_path):
     test_jar.TestJar.__init__(self, jar_path)
 
     if not os.path.exists(apk_path):
       raise Exception('%s not found, please build it' % apk_path)
     self._apk_path = apk_path
     self._apk_name = os.path.splitext(os.path.basename(apk_path))[0]
     self._package_name = apk_helper.GetPackageName(self._apk_path)
 
   def GetApkPath(self):
     """Returns the absolute path to the APK."""
     return self._apk_path
 
   def GetApkName(self):
     """Returns the name of the apk without the suffix."""
     return self._apk_name
 
   def GetPackageName(self):
     """Returns the package name of this APK."""
     return self._package_name
 
   # Override.
   def Install(self, adb):
     adb.ManagedInstall(self.GetApkPath(), package_name=self.GetPackageName())
+    # Install apk to be tested.
+    apk_path = _rreplace(self.GetApkPath(), 'Test.apk', '.apk')

[frankf, 2013/07/22 20:27:04]

This is not in the CL description. You also need to update the buildbot code not
to install the app separately. Perhaps do this in a separate CL.

[craigdh, 2013/07/22 23:50:25]

Yep I was planning to do that separately. It's not a huge issue as the md5sum
will prevent it from being pushed twice in the meantime.

+    package_name = _rreplace(self.GetPackageName(), '.tests', '')
+    adb.ManagedInstall(apk_path, package_name=package_name)