Changeset 286817 in webkit

Timestamp:

Dec 9, 2021, 4:30:40 PM (5 years ago)

Author:

Lauro Moura

Message:

[webkitpy] Make check-webkit-style check WebDriverTests/TestExpectations.json
​https://bugs.webkit.org/show_bug.cgi?id=213453

Reviewed by Adrian Perez de Castro.

While the WebDriver tests are imported and mostly ignored by
check-webkit-style, the script must check TestExpectations.json
to avoid commiting invalid json data and breaking the bots.

• Scripts/webkitpy/style/checker.py:
• Scripts/webkitpy/style/checker_unittest.py:

(CheckerDispatcherSkipTest._assert_should_skip_without_warning): Pass
a valid error handler so the JSONChecker can be instantiated.
(CheckerDispatcherSkipTest.test_should_skip_without_warningfalse):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/style/checker.py (modified) (1 diff)
• Scripts/webkitpy/style/checker_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-09  Lauro Moura  <lmoura@igalia.com>
+
+        [webkitpy] Make check-webkit-style check WebDriverTests/TestExpectations.json
+        https://bugs.webkit.org/show_bug.cgi?id=213453
+
+        Reviewed by Adrian Perez de Castro.
+
+        While the WebDriver tests are imported and mostly ignored by
+        check-webkit-style, the script must check TestExpectations.json
+        to avoid commiting invalid json data and breaking the bots.
+
+        * Scripts/webkitpy/style/checker.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+        (CheckerDispatcherSkipTest._assert_should_skip_without_warning): Pass
+        a valid error handler so the JSONChecker can be instantiated.
+        (CheckerDispatcherSkipTest.test_should_skip_without_warning__false):
+
 2021-12-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/Scripts/webkitpy/style/checker.py

@@ -369 +369 @@
 _NEVER_SKIPPED_FILES = _NEVER_SKIPPED_JS_FILES + [
     'TestExpectations',
+    'TestExpectations.json',
     '.py'
 ]

trunk/Tools/Scripts/webkitpy/style/checker_unittest.py

@@ -320 +320 @@
         # Check the file type before asserting the return value.
         checker = self._dispatcher.dispatch(file_path=path,
-                                            handle_style_error=None,
+                                            handle_style_error=DefaultStyleErrorHandler('', None, None, []),
                                             min_confidence=3,
                                             commit_queue=False)
@@ -349 +349 @@
                  os.path.join('LayoutTests', 'ChangeLog'),
                  os.path.join('LayoutTests', 'foo.py'),
+                 os.path.join('WebDriverTests', 'ChangeLog'),
+                 os.path.join('WebDriverTests', 'TestExpectations.json'),
         ]