Attachment 369687 Details for Bug 197826 – Patch

[patch] Patch

bug-197826-20190512195024.patch (text/plain), 14.65 KB, created by youenn fablet on 2019-05-12 19:50:25 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-05-12 19:50:25 PDT

Size: 14.65 KB

patch

obsolete

>Subversion Revision: 245178
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index bf482369c7e6c3da610a512b14865caeb8926738..13e21371a2a3aa2bc03a420b7b09943275389ea0 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,40 @@
>+2019-05-12  Youenn Fablet  <youenn@apple.com>
>+
>+        Add support for webkit-test-runner options to WPT importer
>+        https://bugs.webkit.org/show_bug.cgi?id=197826
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        In case of overwriting an existing test, check if the existing test
>+        contains a  comment and insert it back if
>+        needed in the new test.
>+
>+        For exporter, forbid creating a WPT PR if there are changes containing
>+        the webkit-test-runner string.
>+
>+        * Scripts/webkitpy/w3c/test_converter.py:
>+        (convert_for_webkit):
>+        (_W3CTestConverter.__init__):
>+        (_W3CTestConverter.add_webkit_test_runner_options_if_needed):
>+        (_W3CTestConverter.handle_starttag):
>+        (_W3CTestConverter.handle_comment):
>+        (_W3CTestConverter.handle_decl):
>+        (_W3CTestConverter.handle_pi):
>+        * Scripts/webkitpy/w3c/test_exporter.py:
>+        (WebPlatformTestExporter.write_git_patch_file):
>+        (WebPlatformTestExporter.make_pull_request):
>+        * Scripts/webkitpy/w3c/test_importer.py:
>+        (TestImporter.webkit_test_runner_options):
>+        (TestImporter):
>+        (TestImporter.add_webkit_test_runner_options_to_content):
>+        (TestImporter.copy_html_file):
>+        (TestImporter.write_html_template):
>+        (TestImporter.write_html_files_for_templated_js_tests):
>+        (TestImporter.import_tests):
>+        * Scripts/webkitpy/w3c/test_importer_unittest.py:
>+        (test_manual_slow_test):
>+        (test_webkit_test_runner_options):
>+
> 2019-05-10  Youenn Fablet  <youenn@apple.com>
> 
>         A service worker instance should be terminated when its SWServer is destroyed
>diff --git a/Tools/Scripts/webkitpy/w3c/test_converter.py b/Tools/Scripts/webkitpy/w3c/test_converter.py
>index 6e2996e9013655c08615505d169b06b3126b65ed..5274a290551be3a55f0b00ece194c9a76e879f5f 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_converter.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_converter.py
>@@ -38,12 +38,12 @@ from HTMLParser import HTMLParser
> _log = logging.getLogger(__name__)
> 
> 
>-def convert_for_webkit(new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True):
>+def convert_for_webkit(new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True, webkit_test_runner_options=''):
>     """ Converts a file's |contents| so it will function correctly in its |new_path| in Webkit.
> 
>     Returns the list of modified properties and the modified text if the file was modifed, None otherwise."""
>     contents = host.filesystem.read_binary_file(filename)
>-    converter = _W3CTestConverter(new_path, filename, reference_support_info, host, convert_test_harness_links)
>+    converter = _W3CTestConverter(new_path, filename, reference_support_info, host, convert_test_harness_links, webkit_test_runner_options)
>     if filename.endswith('.css'):
>         return converter.add_webkit_prefix_to_unprefixed_properties_and_values(contents)
>     else:
>@@ -53,7 +53,7 @@ def convert_for_webkit(new_path, filename, reference_support_info, host=Host(),
> 
> 
> class _W3CTestConverter(HTMLParser):
>-    def __init__(self, new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True):
>+    def __init__(self, new_path, filename, reference_support_info, host=Host(), convert_test_harness_links=True, webkit_test_runner_options=''):
>         HTMLParser.__init__(self)
> 
>         self._host = host
>@@ -67,6 +67,8 @@ class _W3CTestConverter(HTMLParser):
>         self.style_data = []
>         self.filename = filename
>         self.reference_support_info = reference_support_info
>+        self.webkit_test_runner_options = webkit_test_runner_options
>+        self.has_started = False
> 
>         resources_path = self.path_from_webkit_root('LayoutTests', 'resources')
>         resources_relpath = self._filesystem.relpath(resources_path, new_path)
>@@ -215,10 +217,18 @@ class _W3CTestConverter(HTMLParser):
> 
>         self.converted_data.append(converted)
> 
>+    def add_webkit_test_runner_options_if_needed(self):
>+        if self.has_started:
>+            return
>+        self.has_started = True
>+        if self.webkit_test_runner_options:
>+            self.converted_data[-1] = self.converted_data[-1] + self.webkit_test_runner_options
>+
>     def handle_starttag(self, tag, attrs):
>         if tag == 'style':
>             self.in_style_tag = True
>         self.convert_attributes_if_needed(tag, attrs)
>+        self.add_webkit_test_runner_options_if_needed()
> 
>     def handle_endtag(self, tag):
>         if tag == 'style':
>@@ -244,9 +254,12 @@ class _W3CTestConverter(HTMLParser):
> 
>     def handle_comment(self, data):
>         self.converted_data.extend([''])
>+        self.add_webkit_test_runner_options_if_needed()
> 
>     def handle_decl(self, decl):
>         self.converted_data.extend(['<!', decl, '>'])
>+        self.add_webkit_test_runner_options_if_needed()
> 
>     def handle_pi(self, data):
>         self.converted_data.extend(['<?', data, '>'])
>+        self.add_webkit_test_runner_options_if_needed()
>diff --git a/Tools/Scripts/webkitpy/w3c/test_exporter.py b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>index 0abcee7ccd1e2a11801d00a8cd26c0d3e104d3b8..d48db75cb117f0c51e4693c300b383b18a21436d 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_exporter.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>@@ -182,6 +182,13 @@ class WebPlatformTestExporter(object):
>             return ''
>         # FIXME: We can probably try to use --relative git parameter to not do that replacement.
>         patch_data = patch_data.replace(WEBKIT_WPT_DIR + '/', '')
>+
>+        # FIXME: Support stripping of  comments.
>+        self.has_webkit_test_runner_specific_changes = 'webkit-test-runner' in patch_data
>+        if self.has_webkit_test_runner_specific_changes:
>+            _log.warning("Patch contains webkit-test-runner specific changes, please remove them before creating a PR")
>+            return ''
>+
>         self._filesystem.write_text_file(patch_file, patch_data)
>         return patch_file
> 
>@@ -306,6 +313,10 @@ class WebPlatformTestExporter(object):
>         return True
> 
>     def make_pull_request(self):
>+        if self.has_webkit_test_runner_specific_changes:
>+            _log.error('Cannot create a WPT PR since it contains webkit test runner specific changes')
>+            return
>+
>         if not self._github:
>             _log.info('Skipping pull request because OAuth token was not provided. You can open the pull request manually using the branch ' + self._wpt_fork_branch_github_url)
>             return
>diff --git a/Tools/Scripts/webkitpy/w3c/test_importer.py b/Tools/Scripts/webkitpy/w3c/test_importer.py
>index f92ecd2045887abefde75ddf60e7b85aa6aa1efa..e874808acbd07f1b9fbd587e5570a94a5da4a8ba 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_importer.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_importer.py
>@@ -360,17 +360,49 @@ class TestImporter(object):
>             return True
>         return self.options.convert_test_harness_links
> 
>-    def write_html_files_for_templated_js_tests(self, orig_filepath, new_filepath):
>+    def _webkit_test_runner_options(self, path):
>+        if not(self.filesystem.isfile(path)):
>+            return ''
>+
>+        options_prefix = ''
>+        self.filesystem.write_text_file(new_filepath, content + webkit_test_runner_options)
>+
>+    def write_html_files_for_templated_js_tests(self, orig_filepath, new_filepath):
>         if (orig_filepath.endswith('.window.js')):
>-            self.filesystem.write_text_file(new_filepath.replace('.window.js', '.window.html'), content)
>+            self._write_html_template(new_filepath.replace('.window.js', '.window.html'))
>             return
>         if (orig_filepath.endswith('.worker.js')):
>-            self.filesystem.write_text_file(new_filepath.replace('.worker.js', '.worker.html'), content)
>+            self._write_html_template(new_filepath.replace('.worker.js', '.worker.html'))
>             return
>         if (orig_filepath.endswith('.any.js')):
>-            self.filesystem.write_text_file(new_filepath.replace('.any.js', '.any.html'), content)
>-            self.filesystem.write_text_file(new_filepath.replace('.any.js', '.any.worker.html'), content)
>+            self._write_html_template(new_filepath.replace('.any.js', '.any.html'))
>+            self._write_html_template(new_filepath.replace('.any.js', '.any.worker.html'))
>             return
> 
>     def import_tests(self):
>@@ -449,7 +481,7 @@ class TestImporter(object):
>                 mimetype = mimetypes.guess_type(orig_filepath)
>                 if should_rewrite_files and ('html' in str(mimetype[0]) or 'xml' in str(mimetype[0])  or 'css' in str(mimetype[0])):
>                     try:
>-                        converted_file = convert_for_webkit(new_path, filename=orig_filepath, reference_support_info=reference_support_info, host=self.host, convert_test_harness_links=self.should_convert_test_harness_links(subpath))
>+                        converted_file = convert_for_webkit(new_path, filename=orig_filepath, reference_support_info=reference_support_info, host=self.host, convert_test_harness_links=self.should_convert_test_harness_links(subpath), webkit_test_runner_options=self._webkit_test_runner_options(new_filepath))
>                     except:
>                         _log.warn('Failed converting %s', orig_filepath)
>                         failed_conversion_files.append(orig_filepath)
>@@ -474,6 +506,8 @@ class TestImporter(object):
>                 elif orig_filepath.endswith('__init__.py') and not self.filesystem.getsize(orig_filepath):
>                     # Some bots dislike empty __init__.py.
>                     self.write_init_py(new_filepath)
>+                elif 'html' in str(mimetype[0]):
>+                    self._copy_html_file(orig_filepath, new_filepath)
>                 else:
>                     self.filesystem.copyfile(orig_filepath, new_filepath)
> 
>diff --git a/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py b/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
>index 47b46208e38d8a4125a1873c7c12e0fd204083f8..7b6429888e103eac6760e733bcb3802389aa3059 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py
>@@ -304,3 +304,28 @@ class TestImporterTest(unittest.TestCase):
>         fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
>         self.assertFalse(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/new-manual.html'))
>         self.assertEquals(tests_options, fs.read_text_file('/mock-checkout/LayoutTests/tests-options.json'))
>+
>+    def test_webkit_test_runner_options(self):
>+        FAKE_FILES = {
>+            '/mock-checkout/WebKitBuild/w3c-tests/csswg-tests/t/test.html': '<!doctype html><script src="/resources/testharness.js"></script><script src="/resources/testharnessreport.js"></script>',
>+            '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/css/test.html': '<!doctype html>\n<script src="/resources/testharness.js"></script><script src="/resources/testharnessreport.js"></script>',
>+            '/mock-checkout/LayoutTests/w3c/web-platform-tests/css/test.html': '',
>+            '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/t/test.html': '<!doctype html><script src="/resources/testharness.js"></script><script src="/resources/testharnessreport.js"></script>',
>+            '/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.html': '',
>+            '/mock-checkout/WebKitBuild/w3c-tests/web-platform-tests/t/test.any.js': 'test(() => {}, "empty")',
>+            '/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.html': '',
>+            '/mock-checkout/Source/WebCore/css/CSSProperties.json': '',
>+            '/mock-checkout/Source/WebCore/css/CSSValueKeywords.in': '',
>+        }
>+        FAKE_FILES.update(FAKE_REPOSITORY)
>+
>+        fs = self.import_downloaded_tests(['--no-fetch', '--import-all', '-d', 'w3c'], FAKE_FILES)
>+
>+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/css/test.html'))
>+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.html'))
>+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.html'))
>+        self.assertTrue(fs.exists('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.worker.html'))
>+        self.assertTrue('' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/css/test.html').split('\n')[0])
>+        self.assertTrue('' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.html').split('\n')[0])
>+        self.assertTrue('' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.html').split('\n')[0])
>+        self.assertFalse('' in fs.read_text_file('/mock-checkout/LayoutTests/w3c/web-platform-tests/t/test.any.worker.html').split('\n')[0])

Actions: View | Formatted Diff | Diff

Attachments on bug 197826: 369687