Update web-platform-tests to revision 3f3849c5d05f9350fad0b06d3bb3ae30d7e18d14

tests/wpt/web-platform-tests/tools/wpt/browser.py

@@ -408,10 +408,10 @@ class Firefox(Browser):
         return m.group(1)
 
 
-class Fennec(Browser):
-    """Fennec-specific interface."""
+class FirefoxAndroid(Browser):
+    """Android-specific Firefox interface."""
 
-    product = "fennec"
+    product = "firefox_android"
     requirements = "requirements_firefox.txt"
 
     def install(self, dest=None, channel=None):

tests/wpt/web-platform-tests/tools/wpt/run.py

@@ -251,9 +251,9 @@ Consider installing certutil via your OS package manager or directly.""")
         kwargs["extra_prefs"].append("media.navigator.streams.fake=true")
 
 
-class Fennec(BrowserSetup):
-    name = "fennec"
-    browser_cls = browser.Fennec
+class FirefoxAndroid(BrowserSetup):
+    name = "firefox_android"
+    browser_cls = browser.FirefoxAndroid
 
     def setup_kwargs(self, kwargs):
         pass
@@ -510,8 +510,8 @@ class Epiphany(BrowserSetup):
 
 
 product_setup = {
-    "fennec": Fennec,
     "firefox": Firefox,
+    "firefox_android": FirefoxAndroid,
     "chrome": Chrome,
     "chrome_android": ChromeAndroid,
     "chrome_ios": ChromeiOS,

tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/__init__.py

@@ -28,8 +28,8 @@ product_list = ["chrome",
                 "edgechromium",
                 "edge",
                 "edge_webdriver",
-                "fennec",
                 "firefox",
+                "firefox_android",
                 "ie",
                 "safari",
                 "sauce",

tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox_android.py

@@ -20,9 +20,9 @@ from .firefox import (get_timeout_multiplier,  # noqa: F401
                       FirefoxBrowser)  # noqa: F401
 
 
-__wptrunner__ = {"product": "fennec",
+__wptrunner__ = {"product": "firefox_android",
                  "check_args": "check_args",
-                 "browser": "FennecBrowser",
+                 "browser": "FirefoxAndroidBrowser",
                  "executor": {"testharness": "MarionetteTestharnessExecutor",
                               "reftest": "MarionetteRefTestExecutor"},
                  "browser_kwargs": "browser_kwargs",
@@ -100,31 +100,19 @@ def write_hosts_file(config, device):
         os.remove(hosts_path)
 
 
-class FennecBrowser(FirefoxBrowser):
+class FirefoxAndroidBrowser(FirefoxBrowser):
     init_timeout = 300
     shutdown_timeout = 60
 
-    def __init__(self, logger, prefs_root, test_type, package_name=None,
+    def __init__(self, logger, prefs_root, test_type, package_name="org.mozilla.geckoview.test",
                  device_serial="emulator-5444", **kwargs):
         FirefoxBrowser.__init__(self, logger, None, prefs_root, test_type, **kwargs)
-        self._package_name = package_name
+        self.package_name = package_name
         self.device_serial = device_serial
         self.tests_root = kwargs["tests_root"]
         self.install_fonts = kwargs["install_fonts"]
         self.stackwalk_binary = kwargs["stackwalk_binary"]
 
-    @property
-    def package_name(self):
-        """
-        Name of app to run on emulator.
-        """
-        if self._package_name is None:
-            self._package_name = "org.mozilla.fennec"
-            user = os.getenv("USER")
-            if user:
-                self._package_name += "_" + user
-        return self._package_name
-
     def start(self, **kwargs):
         if self.marionette_port is None:
             self.marionette_port = get_free_port()