Add more log formatter for --verbose option

Make `--verbose` supports the raw and tbpl log formatters for
the alias of `--log-*-level` option.

tools/wpt/tests/test_run.py

@@ -72,20 +72,56 @@ def test_setup_wptrunner(venv, logger, product):
     run.setup_wptrunner(venv, **kwargs)
 
 
-def test_opt_verbose():
+def test_opt_mach_verbose():
     parser = run.create_parser()
-    kwargs = vars(parser.parse_args("--verbose chrome".split()))
+    kwargs = vars(parser.parse_args("--log-mach - --verbose chrome".split()))
     wptcommandline.check_verbose(kwargs)
     assert kwargs["log_mach_level"] == "debug"
 
 def test_opt_verbose_log_mach_level_debug():
     parser = run.create_parser()
-    kwargs = vars(parser.parse_args("--verbose --log-mach-level debug chrome".split()))
+    kwargs = vars(parser.parse_args("--log-mach - --verbose --log-mach-level debug chrome".split()))
     wptcommandline.check_verbose(kwargs)
     assert kwargs["log_mach_level"] == "debug"
 
 def test_opt_verbose_log_mach_level_info():
     parser = run.create_parser()
-    kwargs = vars(parser.parse_args("--verbose --log-mach-level info chrome".split()))
+    kwargs = vars(parser.parse_args("--log-mach - --verbose --log-mach-level info chrome".split()))
     wptcommandline.check_verbose(kwargs)
     assert kwargs["log_mach_level"] == "info"
+
+def test_opt_raw_verbose():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-raw - --verbose chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_raw_level"] == "debug"
+
+def test_opt_verbose_log_raw_level_debug():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-raw - --verbose --log-raw-level debug chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_raw_level"] == "debug"
+
+def test_opt_verbose_log_raw_level_info():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-raw - --verbose --log-raw-level info chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_raw_level"] == "info"
+
+def test_opt_tbpl_verbose():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-tbpl - --verbose chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_tbpl_level"] == "debug"
+
+def test_opt_verbose_log_tbpl_level_debug():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-tbpl - --verbose --log-tbpl-level debug chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_tbpl_level"] == "debug"
+
+def test_opt_verbose_log_tbpl_level_info():
+    parser = run.create_parser()
+    kwargs = vars(parser.parse_args("--log-tbpl - --verbose --log-tbpl-level info chrome".split()))
+    wptcommandline.check_verbose(kwargs)
+    assert kwargs["log_tbpl_level"] == "info"

tools/wpt/wpt.py

@@ -9,7 +9,6 @@
 from six import iteritems
 from . import virtualenv
 
-from wptrunner import wptcommandline
 
 here = os.path.dirname(__file__)
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
@@ -125,6 +124,7 @@ def main(prog=None, argv=None):
     else:
         args = extras
 
+    from wptrunner import wptcommandline
     wptcommandline.check_verbose(kwargs)
 
     if script:

tools/wptrunner/wptrunner/wptcommandline.py

@@ -529,8 +529,10 @@ def check_args(kwargs):
 
 def check_verbose(kwargs):
     if kwargs.get("verbose"):
-        if not kwargs.get("log_mach_level"):
-            kwargs["log_mach_level"] = "debug"
+        for key, value in kwargs.items():
+            if key.startswith("log_") and not key.endswith("_level"):
+                if kwargs.get(key):
+                    kwargs[key + "_level"] = "debug"
 
 def check_args_update(kwargs):
     set_from_config(kwargs)