2

Changeset 285414 – WebKit

 2 years ago
source link: https://trac.webkit.org/changeset/285414/webkit
Go to the source link to view the article. You can view the picture content, updated content and better typesetting reading experience. If the link is broken, please click the button below to view the snapshot at that time.

Changeset 285414 in webkit

View differences
Show lines around each change
Show the changes in full context
Ignore:
Blank lines
Case changes
White space changes
Timestamp: Nov 8, 2021 10:45:48 AM (7 weeks ago) Author: Manuel Rego Casasnovas Message:

WPT test importer imports rel="mismatch" as the reference
​https://bugs.webkit.org/show_bug.cgi?id=207175
<rdar://problem/69332102>

Reviewed by Jonathan Bedard.

LayoutTests/imported/w3c:

Re-imported css/css-fonts/standard-font-family-5.html from WPT, so the -expected.html file gets renamed to -expected-mismatch.html.

  • web-platform-tests/css/css-fonts/standard-font-family-5-expected-mismatch.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected.html.
  • web-platform-tests/css/css-fonts/w3c-import.log:

Tools:

Setting "-expected-mismatch" suffix for <meta rel="mismatch"> references from WPT.

  • Scripts/webkitpy/w3c/test_importer.py:

(TestImporter.find_importable_tests): Adding "-mismatch" suffix as needed.

  • Scripts/webkitpy/w3c/test_parser.py:

(TestParser.analyze_test): Store the reference type in test_infotype?.

  • Scripts/webkitpy/w3c/test_parser_unittest.py:

(test_analyze_test_reftest_one_mismatch): Add new test cases for the reference type.

LayoutTests:

css/css-fonts/standard-font-family-5.html stars passing now.

Location: trunk Files:
8 edited 1 moved

  • TabularUnified trunk/LayoutTests/ChangeLog

    r285408 r285414   12021-11-08  Manuel Rego Casasnovas  <[email protected]> 2 3        WPT test importer imports rel="mismatch" as the reference 4        https://bugs.webkit.org/show_bug.cgi?id=207175 5        <rdar://problem/69332102> 6 7        Reviewed by Jonathan Bedard. 8 9        css/css-fonts/standard-font-family-5.html stars passing now. 10 11        * TestExpectations: 12 1132021-11-08  Antti Koivisto  <[email protected]> 214

  • TabularUnified trunk/LayoutTests/TestExpectations

    r285408 r285414   35743574webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-3.html [ ImageOnlyFailure ] 35753575webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4.html [ ImageOnlyFailure ] 3576webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5.html [ ImageOnlyFailure ] 35773576webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-6.html [ ImageOnlyFailure ] 35783577webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-7.html [ ImageOnlyFailure ]

  • TabularUnified trunk/LayoutTests/imported/w3c/ChangeLog

    r285408 r285414   12021-11-08  Manuel Rego Casasnovas  <[email protected]> 2 3        WPT test importer imports rel="mismatch" as the reference 4        https://bugs.webkit.org/show_bug.cgi?id=207175 5        <rdar://problem/69332102> 6 7        Reviewed by Jonathan Bedard. 8 9        Re-imported css/css-fonts/standard-font-family-5.html from WPT, so the -expected.html file gets renamed to -expected-mismatch.html. 10 11        * web-platform-tests/css/css-fonts/standard-font-family-5-expected-mismatch.html: Renamed from LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected.html. 12        * web-platform-tests/css/css-fonts/w3c-import.log: 13 1142021-11-08  Antti Koivisto  <[email protected]> 215

  • TabularUnified trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/w3c-import.log

    r277091 r285414   424424/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html 425425/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4.html 426/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected.html 426/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected-mismatch.html 427427/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html 428428/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5.html

  • TabularUnified trunk/Tools/ChangeLog

    r285411 r285414   12021-11-08  Manuel Rego Casasnovas  <[email protected]> 2 3        WPT test importer imports rel="mismatch" as the reference 4        https://bugs.webkit.org/show_bug.cgi?id=207175 5        <rdar://problem/69332102> 6 7        Reviewed by Jonathan Bedard. 8 9        Setting "-expected-mismatch" suffix for <meta rel="mismatch"> references from WPT. 10 11        * Scripts/webkitpy/w3c/test_importer.py: 12        (TestImporter.find_importable_tests): Adding "-mismatch" suffix as needed. 13        * Scripts/webkitpy/w3c/test_parser.py: 14        (TestParser.analyze_test): Store the reference type in test_info["type"]. 15        * Scripts/webkitpy/w3c/test_parser_unittest.py: 16        (test_analyze_test_reftest_one_mismatch): Add new test cases for the reference type. 17 1182021-11-08  Kate Cheney  <[email protected]> 219

  • TabularUnified trunk/Tools/Scripts/webkitpy/w3c/test_importer.py

    r283230 r285414   350350                    # reference files. 351351                    ref_file = self.filesystem.splitext(test_basename)[0] + '-expected' 352                    if test_info['type'] == 'mismatch': 353                        ref_file += '-mismatch' 352354                    ref_file += self.filesystem.splitext(test_info['reference'])[1] 353355

  • TabularUnified trunk/Tools/Scripts/webkitpy/w3c/test_parser.py

    r284979 r285414   9898                else: 9999                    ref_file = self.filesystem.join(self.filesystem.dirname(self.filename), href_match_file) 100 101                reference_type = matches[0]['rel'][0] if isinstance(matches[0]['rel'], list) else matches[0]['rel'] 100102            except KeyError as e: 101103                # FIXME: Figure out what to do w/ invalid test files. … …   109111                self.load_file(ref_file, True) 110112 111            test_info = {'test': self.filename, 'reference': ref_file} 113            test_info = {'test': self.filename, 'reference': ref_file, 'type': reference_type} 112114 113115            # If the ref file does not live in the same directory as the test file, check it for support files

  • TabularUnified trunk/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py

    r284979 r285414   5454        self.assertTrue('reference' in test_info.keys(), 'did not find a reference file') 5555        self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct') 56        self.assertTrue('type' in test_info.keys(), 'did not find a reference type') 57        self.assertEqual(test_info['type'], 'match', 'reference type is not correct') 58        self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test') 59        self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest') 60 61    def test_analyze_test_reftest_one_mismatch(self): 62        test_html = """<head> 63<link rel="mismatch" href="green-box-ref.xht" /> 64</head> 65""" 66        test_path = os.path.join(os.path.sep, 'some', 'madeup', 'path') 67        parser = TestParser(options, os.path.join(test_path, 'somefile.html')) 68        test_info = parser.analyze_test(test_contents=test_html) 69 70        self.assertNotEqual(test_info, None, 'did not find a test') 71        self.assertTrue('test' in test_info.keys(), 'did not find a test file') 72        self.assertTrue('reference' in test_info.keys(), 'did not find a reference file') 73        self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct') 74        self.assertTrue('type' in test_info.keys(), 'did not find a reference type') 75        self.assertEqual(test_info['type'], 'mismatch', 'reference type is not correct') 5676        self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test') 5777        self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')
Note: See TracChangeset for help on using the changeset viewer.

report

Recommend

About Joyk


Aggregate valuable and interesting links.
Joyk means Joy of geeK