Attachment 341661 Details for Bug 186133 – Patch

[patch] Patch

bug-186133-20180531143256.patch (text/plain), 3.02 KB, created by Frédéric Wang (:fredw) on 2018-05-31 05:32:57 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frédéric Wang (:fredw)

Created: 2018-05-31 05:32:57 PDT

Size: 3.02 KB

patch

obsolete

>Subversion Revision: 232288
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 10e9cfbe52c401c9e4b26c80817d4be75b7dac61..65d1a01a8eaf8d14a56a80ae62e4ac35d50235d2 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,13 @@
>+2018-05-31  Frederic Wang  <fwang@igalia.com>
>+
>+        export-w3c-test-changes cannot apply patches when some w3c-import.log files are changed
>+        https://bugs.webkit.org/show_bug.cgi?id=186133
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * Scripts/webkitpy/w3c/test_exporter.py: Exclude w3c-import.log from the diff.
>+        * Scripts/webkitpy/w3c/test_exporter_unittest.py: Add unit test.
>+
> 2018-05-29  Youenn Fablet  <youenn@apple.com>
> 
>         Add a consistency check between URL and CFURL
>diff --git a/Tools/Scripts/webkitpy/w3c/test_exporter.py b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>index f762de4647c472fbe60cfe7474cf68569ffb71c4..7f9b0e8eaaff82be4a2855923f67a27c8a1137e6 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_exporter.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_exporter.py
>@@ -46,7 +46,7 @@ WEBKIT_WPT_DIR = 'LayoutTests/imported/w3c/web-platform-tests'
> WPT_PR_URL = "https://github.com/%s/web-platform-tests/pull/" % WPT_GH_ORG
> WEBKIT_EXPORT_PR_LABEL = 'webkit-export'
> 
>-EXCLUDED_FILE_SUFFIXES = ['-expected.txt', '.worker.html', '.any.html', '.any.worker.html']
>+EXCLUDED_FILE_SUFFIXES = ['-expected.txt', '.worker.html', '.any.html', '.any.worker.html', 'w3c-import.log']
> 
> 
> class WebPlatformTestExporter(object):
>diff --git a/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py b/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py
>index a6ad8fca158aba8f00e59910e9661ab5adb7bf38..ede6b42a37fd1ffec4758ea133096bb4b37a2617 100644
>--- a/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py
>+++ b/Tools/Scripts/webkitpy/w3c/test_exporter_unittest.py
>@@ -219,6 +219,18 @@ Subversion Revision: 231920
> diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/header-values-expected.txt
> 
> +change to expected
>+"""
>+        options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN'])
>+        exporter = WebPlatformTestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)
>+        self.assertFalse(exporter.has_wpt_changes())
>+
>+    def test_ignore_changes_to_w3c_import_log(self):
>+        host = TestExporterTest.MyMockHost()
>+        host._mockSCM.mock_format_patch_result = """
>+Subversion Revision: 231920
>+diff --git a/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/w3c-import.log b/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/w3c-import.log
>+
>++change to w3c import
> """
>         options = parse_args(['test_exporter.py', '-g', 'HEAD', '-b', '1234', '-c', '-n', 'USER', '-t', 'TOKEN'])
>         exporter = WebPlatformTestExporter(host, options, TestExporterTest.MockGit, TestExporterTest.MockBugzilla, MockWPTGitHub, TestExporterTest.MockWPTLinter)

Actions: View | Formatted Diff | Diff

Attachments on bug 186133: 341661