Bug 1908915 - Don't produce verbose geckodriver logs for mach test-interventions, r=twisniewski

Instead of always passing in `-vv`, pass in `-vv` if the `debug` flag
is set, or `-v` if we have some mozlog logger that's configured to
debug level.

Differential Revision: https://phabricator.services.mozilla.com/D217099

Author: jgraham

testing/webcompat/fixtures.py

@@ -32,8 +32,10 @@ def __init__(self, config):
         self.addon = config.getoption("addon")
         self.webdriver_binary = config.getoption("webdriver_binary")
         self.port = config.getoption("webdriver_port")
-        self.wsPort = config.getoption("webdriver_ws_port")
+        self.ws_port = config.getoption("webdriver_ws_port")
+        self.log_level = config.getoption("webdriver_log_level")
         self.headless = config.getoption("headless")
+        self.debug = config.getoption("debug")
         self.proc = None
 
     def command_line_driver(self):
@@ -53,14 +55,18 @@ def __exit__(self, *args, **kwargs):
 
 class FirefoxWebDriver(WebDriver):
     def command_line_driver(self):
-        return [
+        rv = [
             self.webdriver_binary,
             "--port",
             str(self.port),
             "--websocket-port",
-            str(self.wsPort),
-            "-vv",
+            str(self.ws_port),
         ]
+        if self.debug:
+            rv.append("-vv")
+        elif self.log_level == "DEBUG":
+            rv.append("-v")
+        return rv
 
     def capabilities(self, test_config):
         prefs = {}

testing/webcompat/mach_commands.py

@@ -231,6 +231,26 @@ def run(self, command_context, **kwargs):
             "test-interventions", kwargs, {"mach": sys.stdout}
         )
         logger = mozlog.get_default_logger("test-interventions")
+
+        log_level = "INFO"
+        # It's not trivial to get a single log level out of mozlog, because we might have
+        # different levels going to different outputs. We look for the maximum (i.e. most
+        # verbose) level of any handler with an attached formatter.
+        configured_level_number = None
+        for handler in logger.handlers:
+            if hasattr(handler, "formatter") and hasattr(handler.formatter, "level"):
+                formatter_level = handler.formatter.level
+                configured_level_number = (
+                    formatter_level
+                    if configured_level_number is None
+                    else max(configured_level_number, formatter_level)
+                )
+        if configured_level_number is not None:
+            for level, number in mozlog.structuredlog.log_levels.items():
+                if number == configured_level_number:
+                    log_level = level
+                    break
+
         status_handler = mozlog.handlers.StatusHandler()
         logger.add_handler(status_handler)
 
@@ -262,6 +282,7 @@ def run(self, command_context, **kwargs):
                     config=kwargs["config"],
                     headless=kwargs["headless"],
                     do2fa=kwargs["do2fa"],
+                    log_level=log_level,
                 )
 
         if kwargs["shims"] != "none":

testing/webcompat/runner.py

@@ -30,6 +30,7 @@ def run(
     headless=False,
     addon=None,
     do2fa=False,
+    log_level="INFO",
 ):
     """"""
     old_environ = os.environ.copy()
@@ -64,6 +65,8 @@ def run(
                 webdriver_port,
                 "--webdriver-ws-port",
                 webdriver_ws_port,
+                "--webdriver-log-level",
+                log_level,
             ]
 
             if debug:
@@ -162,6 +165,12 @@ def pytest_addoption(self, parser):
             default="9222",
             help="Port on which to run WebDriver BiDi websocket",
         )
+        parser.addoption(
+            "--webdriver-log-level",
+            action="store",
+            default="INFO",
+            help="Log level to use for WebDriver",
+        )
         parser.addoption(
             "--browser", action="store", choices=["firefox"], help="Name of the browser"
         )