Bug 1370203 - Check hosts are configured with |mach wpt|, r=farre draft
authorJames Graham <james@hoppipolla.co.uk>
Mon, 05 Jun 2017 13:29:47 +0100
changeset 589009 38095a3238916fcfde68f39c2dbfa61c1b0a897d
parent 589008 b60663f08f7f98109d479fb64e32d08dd8fff473
child 589010 ec460b449e3d709000ff193e0eb41ac0b74a28f3
push id62219
push userbmo:james@hoppipolla.co.uk
push dateMon, 05 Jun 2017 12:34:46 +0000
reviewersfarre
bugs1370203
milestone55.0a1
Bug 1370203 - Check hosts are configured with |mach wpt|, r=farre For Chrome and Edge we don't have any way to set the DNS configuration to include web-platform.test, so we need to error if this isn't already set. MozReview-Commit-ID: BHRsTiuV28x
testing/web-platform/mach_commands.py
--- a/testing/web-platform/mach_commands.py
+++ b/testing/web-platform/mach_commands.py
@@ -70,25 +70,33 @@ class WebPlatformTestsRunner(MozbuildObj
     def setup_kwargs_wptrun(self, kwargs):
         from wptrunner import wptcommandline
         here = os.path.join(self.topsrcdir, 'testing', 'web-platform')
 
         sys.path.insert(0, os.path.join(here, "tests", "tools"))
 
         import wptrun
 
+        product = kwargs["product"]
+
         setup_func = {
             "chrome": wptrun.setup_chrome,
             "edge": wptrun.setup_edge,
             "servo": wptrun.setup_servo,
-        }[kwargs["product"]]
+        }[product]
+
+        try:
+            wptrun.check_environ(product)
 
-        setup_func(wptrun.virtualenv.Virtualenv(self.virtualenv_manager.virtualenv_root),
-                   kwargs,
-                   True)
+            setup_func(wptrun.virtualenv.Virtualenv(self.virtualenv_manager.virtualenv_root),
+                       kwargs,
+                       True)
+        except wptrun.WptrunError as e:
+            print(e.message, file=sys.stderr)
+            sys.exit(1)
 
         kwargs["tests_root"] = os.path.join(here, "tests")
 
         if kwargs["metadata_root"] is None:
             metadir = os.path.join(here, "products", kwargs["product"])
             if not os.path.exists(metadir):
                 os.makedirs(metadir)
             kwargs["metadata_root"] = metadir