Bug 1550069 - Quick fix for 'mach android-emulator' handling of tooltool checksum file; r=aerickson
authorGeoff Brown <gbrown@mozilla.com>
Wed, 08 May 2019 19:52:47 +0000
changeset 531931 b895777154c658879b8f97e46b1aff2f1e29a3c6
parent 531930 14654d375cc67708a8fc03e7e3e87bcad8d5abe6
child 531932 a0ab4288cda4246470aae59f9f1be2c1be65dcd8
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersaerickson
bugs1550069
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1550069 - Quick fix for 'mach android-emulator' handling of tooltool checksum file; r=aerickson I think a more robust solution would involve disabling the checksum behavior in tooltool.py; I will leave-open for us to consider later. In the meantime, this will get things working again. Differential Revision: https://phabricator.services.mozilla.com/D30403
testing/mozbase/mozrunner/mozrunner/devices/android_device.py
--- a/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
+++ b/testing/mozbase/mozrunner/mozrunner/devices/android_device.py
@@ -511,16 +511,19 @@ class AndroidEmulator(object):
            cache) and install the AVD.
         """
         avd = os.path.join(
             EMULATOR_HOME_DIR, 'avd', self.avd_info.name + '.avd')
         ini_file = os.path.join(
             EMULATOR_HOME_DIR, 'avd', self.avd_info.name + '.ini')
         if force and os.path.exists(avd):
             shutil.rmtree(avd)
+        if force:
+            for f in glob.glob(os.path.join(EMULATOR_HOME_DIR, 'AVD*.checksum')):
+                os.remove(f)
         if not os.path.exists(avd):
             if os.path.exists(ini_file):
                 os.remove(ini_file)
             path = self.avd_info.tooltool_manifest
             _get_tooltool_manifest(self.substs, path, EMULATOR_HOME_DIR, 'releng.manifest')
             _tooltool_fetch()
             self._update_avd_paths()