Cache device apk checksums in device_utils.py

build/android/pylib/device/device_utils_test.py

 #!/usr/bin/env python
 # 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.
 
 """
 Unit tests for the contents of device_utils.py (mostly DeviceUtils).
 """
 
 # pylint: disable=C0321
@@ skipping 348 matching lines @@
 @mock.patch('time.sleep', mock.Mock())
 class DeviceUtilsWaitUntilFullyBootedTest(DeviceUtilsTest):
 
   def testWaitUntilFullyBooted_succeedsNoWifi(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
          ['package:/some/fake/path']),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '1')):
       self.device.WaitUntilFullyBooted(wifi=False)
 
   def testWaitUntilFullyBooted_succeedsWithWifi(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
          ['package:/some/fake/path']),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '1'),
         # wifi_enabled
         (self.call.adb.Shell('dumpsys wifi'),
          'stuff\nWi-Fi is enabled\nmore stuff\n')):
       self.device.WaitUntilFullyBooted(wifi=True)
 
   def testWaitUntilFullyBooted_deviceNotInitiallyAvailable(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), self.AdbCommandError()),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), self.AdbCommandError()),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), self.AdbCommandError()),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), self.AdbCommandError()),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
          ['package:/some/fake/path']),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '1')):
       self.device.WaitUntilFullyBooted(wifi=False)
 
   def testWaitUntilFullyBooted_sdCardReadyFails_noPath(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), self.CommandError())):
@@ skipping 16 matching lines @@
       with self.assertRaises(device_errors.CommandTimeoutError):
         self.device.WaitUntilFullyBooted(wifi=False)
 
   def testWaitUntilFullyBooted_devicePmFails(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'), self.CommandError()),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
+         self.CommandError()),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'), self.CommandError()),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
+         self.CommandError()),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'), self.TimeoutError())):
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
+         self.TimeoutError())):
       with self.assertRaises(device_errors.CommandTimeoutError):
         self.device.WaitUntilFullyBooted(wifi=False)
 
   def testWaitUntilFullyBooted_bootFails(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
          ['package:/some/fake/path']),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '0'),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '0'),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), self.TimeoutError())):
       with self.assertRaises(device_errors.CommandTimeoutError):
         self.device.WaitUntilFullyBooted(wifi=False)
 
   def testWaitUntilFullyBooted_wifiFails(self):
     with self.assertCalls(
         self.call.adb.WaitForDevice(),
         # sd_card_ready
         (self.call.device.GetExternalStoragePath(), '/fake/storage/path'),
         (self.call.adb.Shell('test -d /fake/storage/path'), ''),
         # pm_ready
-        (self.call.device.GetApplicationPaths('android'),
+        (self.call.device.GetApplicationPaths('android', skip_cache=True),
          ['package:/some/fake/path']),
         # boot_completed
         (self.call.device.GetProp('sys.boot_completed'), '1'),
         # wifi_enabled
         (self.call.adb.Shell('dumpsys wifi'), 'stuff\nmore stuff\n'),
         # wifi_enabled
         (self.call.adb.Shell('dumpsys wifi'), 'stuff\nmore stuff\n'),
         # wifi_enabled
         (self.call.adb.Shell('dumpsys wifi'), self.TimeoutError())):
       with self.assertRaises(device_errors.CommandTimeoutError):
@@ skipping 36 matching lines @@
         (self.call.device.GetApplicationPaths('this.is.a.test.package'), []),
         self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
       self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_differentPriorInstall(self):
     with self.assertCalls(
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPaths('this.is.a.test.package'),
          ['/fake/data/app/this.is.a.test.package.apk']),
-        (self.call.device._GetChangedAndStaleFiles(
-            '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         ([('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')],
-          [])),
+        (self.call.device._ComputeStaleApks('this.is.a.test.package',
+            ['/fake/test/app.apk']),
+         (['/fake/test/app.apk'], None)),
         self.call.adb.Uninstall('this.is.a.test.package'),
         self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
       self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_differentPriorInstall_reinstall(self):
     with self.assertCalls(
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPaths('this.is.a.test.package'),
          ['/fake/data/app/this.is.a.test.package.apk']),
-        (self.call.device._GetChangedAndStaleFiles(
-            '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         ([('/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk')],
-          [])),
+        (self.call.device._ComputeStaleApks('this.is.a.test.package',
+            ['/fake/test/app.apk']),
+         (['/fake/test/app.apk'], None)),
         self.call.adb.Install('/fake/test/app.apk', reinstall=True)):
       self.device.Install('/fake/test/app.apk', reinstall=True, retries=0)
 
   def testInstall_identicalPriorInstall(self):
     with self.assertCalls(
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPaths('this.is.a.test.package'),
          ['/fake/data/app/this.is.a.test.package.apk']),
-        (self.call.device._GetChangedAndStaleFiles(
-            '/fake/test/app.apk', '/fake/data/app/this.is.a.test.package.apk'),
-         ([], []))):
+        (self.call.device._ComputeStaleApks('this.is.a.test.package',
+            ['/fake/test/app.apk']),
+         ([], None))):
       self.device.Install('/fake/test/app.apk', retries=0)
 
   def testInstall_fails(self):
     with self.assertCalls(
         (mock.call.pylib.utils.apk_helper.GetPackageName('/fake/test/app.apk'),
          'this.is.a.test.package'),
         (self.call.device.GetApplicationPaths('this.is.a.test.package'), []),
         (self.call.adb.Install('/fake/test/app.apk', reinstall=False),
          self.CommandError('Failure\r\n'))):
       with self.assertRaises(device_errors.CommandFailedError):
@@ skipping 20 matching lines @@
     with self.assertCalls(
         (self.call.device._CheckSdkLevel(21)),
         (mock.call.pylib.sdk.split_select.SelectSplits(
             self.device, 'base.apk',
             ['split1.apk', 'split2.apk', 'split3.apk']),
          ['split2.apk']),
         (mock.call.pylib.utils.apk_helper.GetPackageName('base.apk'),
          'test.package'),
         (self.call.device.GetApplicationPaths('test.package'),
          ['base-on-device.apk', 'split2-on-device.apk']),
-        (mock.call.pylib.utils.md5sum.CalculateDeviceMd5Sums(
-            ['base-on-device.apk', 'split2-on-device.apk'], self.device),
-         {'base-on-device.apk': 'AAA', 'split2-on-device.apk': 'BBB'}),
-        (mock.call.pylib.utils.md5sum.CalculateHostMd5Sums(
-            ['base.apk', 'split2.apk']),
-         {'base.apk': 'AAA', 'split2.apk': 'CCC'}),
+        (self.call.device._ComputeStaleApks('test.package',
+                                            ['base.apk', 'split2.apk']),
+         (['split2.apk'], None)),
         (self.call.adb.InstallMultiple(
             ['split2.apk'], partial='test.package', reinstall=True))):
       self.device.InstallSplitApk('base.apk',
           ['split1.apk', 'split2.apk', 'split3.apk'], reinstall=True, retries=0)
 
 
 class DeviceUtilsRunShellCommandTest(DeviceUtilsTest):
 
   def setUp(self):
     super(DeviceUtilsRunShellCommandTest, self).setUp()
@@ skipping 1217 matching lines @@
       devices = device_utils.DeviceUtils.HealthyDevices()
     self.assertEquals(1, len(devices))
     self.assertTrue(isinstance(devices[0], device_utils.DeviceUtils))
     self.assertEquals('0123456789abcdef', devices[0].adb.GetDeviceSerial())
 
 
 if __name__ == '__main__':
   logging.getLogger().setLevel(logging.DEBUG)
   unittest.main(verbosity=2)