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

build/android/pylib/android_commands.py

Index: build/android/pylib/android_commands.py
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py
index 4cba47a296adca741d45037c5e164ca4bfe59e97..4fd9b9ad12e204ad90084015724605729ab0e426 100644
--- a/build/android/pylib/android_commands.py
+++ b/build/android/pylib/android_commands.py
@@ -408,16 +408,24 @@ class AndroidCommands(object):
                      reboots_on_failure=2):
     """Installs specified package and reboots device on timeouts.
 
+    If package_name is supplied, checks if the package is already installed and
+    doesn't reinstall if the apk md5sums match.
+
     Args:
       apk_path: Path to .apk file to install.
       keep_data: Reinstalls instead of uninstalling first, preserving the
         application data.
       package_name: Package name (only needed if keep_data=False).
       reboots_on_failure: number of time to reboot if package manager is frozen.
-
-    Returns:
-      A status string returned by adb install
     """
+    # Check if package is already installed and up to date.
+    if package_name:
+      installed_apk_path = self.GetApplicationPath(package_name)
+      if installed_apk_path and self.CheckMd5Sum(apk_path, installed_apk_path):
+        logging.info('Skipped install: identical %s apk already installed' %
+            package_name)
+        return
+    # Install.
     reboots_left = reboots_on_failure
     while True:
       try:
@@ -426,7 +434,7 @@ class AndroidCommands(object):
           self.Uninstall(package_name)
         install_status = self.Install(apk_path, reinstall=keep_data)
         if 'Success' in install_status:
-          return install_status

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

Make sure callers don't depend on the return value

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

Already checked, they don't.

+          return
       except errors.WaitForResponseTimedOutError:
         print '@@@STEP_WARNINGS@@@'
         logging.info('Timeout on installing %s on device %s', apk_path,
@@ -733,14 +741,12 @@ class AndroidCommands(object):
     """
     self.RunShellCommand('input keyevent %d' % keycode)
 
-  def CheckMd5Sum(self, local_path, device_path, ignore_paths=False):
+  def CheckMd5Sum(self, local_path, device_path):
     """Compares the md5sum of a local path against a device path.
 
     Args:
       local_path: Path (file or directory) on the host.
       device_path: Path on the device.
-      ignore_paths: If False, both the md5sum and the relative paths/names of
-          files must match. If True, only the md5sum must match.
 
     Returns:
       True if the md5sums match.