Changeset 229921 in webkit

Timestamp:

Mar 23, 2018 2:19:37 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Lint web-platform-tests changes with the wpt linter before exporting
​https://bugs.webkit.org/show_bug.cgi?id=183796

Patch by Brendan McLoughlin <​brendan@bocoup.com> on 2018-03-23
Reviewed by Youenn Fablet.

• Scripts/webkitpy/w3c/test_exporter.py:

(TestExporter.init):
(TestExporter.do_export):

• Scripts/webkitpy/w3c/test_exporter_unittest.py:

(TestExporterTest.MockWPTLinter):
(TestExporterTest.MockWPTLinter.init):
(TestExporterTest.MockWPTLinter.lint):
(TestExporterTest.test_export):
(TestExporterTest.test_export_with_specific_branch):

• Scripts/webkitpy/w3c/wpt_linter.py: Added.

(WPTLinter):
(WPTLinter.init):
(WPTLinter.lint):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/w3c/test_exporter.py (modified) (5 diffs)
• Scripts/webkitpy/w3c/test_exporter_unittest.py (modified) (3 diffs)
• Scripts/webkitpy/w3c/wpt_linter.py (added)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-03-23  Brendan McLoughlin  <brendan@bocoup.com>
+
+        Lint web-platform-tests changes with the wpt linter before exporting
+        https://bugs.webkit.org/show_bug.cgi?id=183796
+
+        Reviewed by Youenn Fablet.
+
+        * Scripts/webkitpy/w3c/test_exporter.py:
+        (TestExporter.__init__):
+        (TestExporter.do_export):
+        * Scripts/webkitpy/w3c/test_exporter_unittest.py:
+        (TestExporterTest.MockWPTLinter):
+        (TestExporterTest.MockWPTLinter.__init__):
+        (TestExporterTest.MockWPTLinter.lint):
+        (TestExporterTest.test_export):
+        (TestExporterTest.test_export_with_specific_branch):
+        * Scripts/webkitpy/w3c/wpt_linter.py: Added.
+        (WPTLinter):
+        (WPTLinter.__init__):
+        (WPTLinter.lint):
+
 2018-03-23  David Kilzer  <ddkilzer@apple.com>
 

trunk/Tools/Scripts/webkitpy/w3c/test_exporter.py

@@ -35 +35 @@
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.w3c.wpt_github import WPTGitHub
+from webkitpy.w3c.wpt_linter import WPTLinter
 
 _log = logging.getLogger(__name__)
@@ -45 +46 @@
 class TestExporter(object):
 
-    def __init__(self, host, options, gitClass=Git, bugzillaClass=Bugzilla, WPTGitHubClass=WPTGitHub):
+    def __init__(self, host, options, gitClass=Git, bugzillaClass=Bugzilla, WPTGitHubClass=WPTGitHub, WPTLinterClass=WPTLinter):
         self._host = host
         self._filesystem = host.filesystem
@@ -65 +66 @@
 
         self._git = self._ensure_wpt_repository("https://github.com/w3c/web-platform-tests.git", self._options.repository_directory, gitClass)
+        self._linter = WPTLinterClass(self._options.repository_directory, host.filesystem)
 
         self._username = options.username
@@ -240 +242 @@
         if git_patch_file:
             self._filesystem.remove(git_patch_file)
+
+        lint_errors = self._linter.lint()
+        if lint_errors:
+            _log.error("The wpt linter detected %s linting error(s). Please address the above errors before attempting to export changes to the web-platform-test repository." % (lint_errors,))
+            self.delete_local_branch()
+            self.clean()
+            return
 
         try:
@@ -296 +305 @@
             return record.getMessage()
 
-    logger = logging.getLogger()
+    logger = logging.getLogger('webkitpy.w3c.test_exporter')
     logger.setLevel(logging.INFO)
     handler = LogHandler()

trunk/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py

@@ -29 +29 @@
 from webkitpy.w3c.wpt_github_mock import MockWPTGitHub
 
+mock_linter = None
 
 class TestExporterTest(unittest.TestCase):
@@ -106 +107 @@
             return self._mockSCM
 
+    class MockWPTLinter(object):
+        def __init__(self, repository_directory, filesystem):
+            self.calls = [repository_directory]
+            # workaround to appease the style checker which thinks
+            # exporter._linter is an instance of WPTLinter and
+            # complains if we try to access the calls property which
+            # only exists on MockWPTLinter
+            global mock_linter
+            mock_linter = self
+
+        def lint(self):
+            self.calls.append('lint')
+            return 0
+
     def test_export(self):
         host = TestExporterTest.MyMockHost()
         options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN'])
-        exporter = TestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub)
+        exporter = TestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)
         exporter.do_export()
         self.assertEquals(exporter._github.calls, ['create_pr', 'add_label "webkit-export"'])
@@ -132 +147 @@
             'fetch bug 1234',
             'post comment to bug 1234 : Submitted web-platform-tests pull request: https://github.com/w3c/web-platform-tests/pull/5678'])
+        self.assertEquals(mock_linter.calls, ['/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests', 'lint'])
 
     def test_export_with_specific_branch(self):
         host = TestExporterTest.MyMockHost()
         options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN', '-bn', 'wpt-export-branch'])
-        exporter = TestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub)
+        exporter = TestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)
         exporter.do_export()
         self.assertEquals(exporter._git.calls, [