Bug 1671350 [wpt PR 26103] - Improve resources tests, a=testonly

Automatic update from web-platform-tests
Add a --headless option to resources/test/

--
Use same Python interpreter for wpt server in resources/test/

--

wpt-commits: bbd1631075b74de45e5f165543d06de20f544f34, 99261220126ae61a7dd40e0eec9fb9a763ba774f
wpt-pr: 26103

Author: gsnedders

testing/web-platform/tests/resources/test/conftest.py

@@ -25,6 +25,7 @@
 
 def pytest_addoption(parser):
     parser.addoption("--binary", action="store", default=None, help="path to browser binary")
+    parser.addoption("--headless", action="store_true", default=False, help="run browser in headless mode")
 
 
 def pytest_collect_file(path, parent):
@@ -45,9 +46,11 @@ def pytest_configure(config):
     config.proc = subprocess.Popen(["geckodriver"])
     config.add_cleanup(config.proc.kill)
 
-    capabilities = {"alwaysMatch": {"acceptInsecureCerts": True}}
+    capabilities = {"alwaysMatch": {"acceptInsecureCerts": True, "moz:firefoxOptions": {}}}
     if config.getoption("--binary"):
-        capabilities["alwaysMatch"]["moz:firefoxOptions"] = {"binary": config.getoption("--binary")}
+        capabilities["alwaysMatch"]["moz:firefoxOptions"]["binary"] = config.getoption("--binary")
+    if config.getoption("--headless"):
+        capabilities["alwaysMatch"]["moz:firefoxOptions"]["args"] = ["--headless"]
 
     config.driver = webdriver.Session("localhost", 4444,
                                       capabilities=capabilities)

testing/web-platform/tests/resources/test/wptserver.py

@@ -24,6 +24,8 @@ def __init__(self, wpt_root):
     def start(self):
         self.devnull = open(os.devnull, 'w')
         wptserve_cmd = [os.path.join(self.wpt_root, 'wpt'), 'serve']
+        if sys.executable:
+            wptserve_cmd[0:0] = [sys.executable]
         logging.info('Executing %s' % ' '.join(wptserve_cmd))
         self.proc = subprocess.Popen(
             wptserve_cmd,