Bug 1507502 - Check for correct installed package when running mach wpt --package; r=kwierso
authorGeoff Brown <gbrown@mozilla.com>
Mon, 19 Nov 2018 08:28:15 -0700
changeset 503518 db64bea68bf3b21691d7643215f03834cb924240
parent 503517 01f5b38c0cb71cc9c31fc2c372cf68c1c3c750e6
child 503519 b1c306693151539e0772bf462cea6ac9f22194d2
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskwierso
bugs1507502
milestone65.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 1507502 - Check for correct installed package when running mach wpt --package; r=kwierso
testing/web-platform/mach_commands.py
--- a/testing/web-platform/mach_commands.py
+++ b/testing/web-platform/mach_commands.py
@@ -29,25 +29,25 @@ class WebPlatformTestsRunnerSetup(Mozbui
     def kwargs_common(self, kwargs):
         build_path = os.path.join(self.topobjdir, 'build')
         here = os.path.split(__file__)[0]
         tests_src_path = os.path.join(here, "tests")
         if build_path not in sys.path:
             sys.path.append(build_path)
 
         if kwargs["product"] == "fennec":
-            # Note that this import may fail in non-fennec trees
-            from mozrunner.devices.android_device import verify_android_device, grant_runtime_permissions
-            verify_android_device(self, install=True, verbose=False, xre=True)
-
             # package_name may be non-fennec in the future
             package_name = kwargs["package_name"]
             if not package_name:
                 package_name = self.substs["ANDROID_PACKAGE_NAME"]
 
+            # Note that this import may fail in non-fennec trees
+            from mozrunner.devices.android_device import verify_android_device, grant_runtime_permissions
+            verify_android_device(self, install=True, verbose=False, xre=True, app=package_name)
+
             grant_runtime_permissions(self, package_name, kwargs["device_serial"])
             if kwargs["certutil_binary"] is None:
                 kwargs["certutil_binary"] = os.path.join(os.environ.get('MOZ_HOST_BIN'), "certutil")
 
             if kwargs["install_fonts"] is None:
                 kwargs["install_fonts"] = True
 
             if kwargs["reftest_internal"] is None: