Attachment #443540 for bug #207175

View Details Raw Unified Return to Bug 207175

| Differences between



2021-11-08  Manuel Rego Casasnovas  <rego@igalia.com>

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

        Reviewed by NOBODY (OOPS!).

        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_info["type"].
        * Scripts/webkitpy/w3c/test_parser_unittest.py:
        (test_analyze_test_reftest_one_mismatch): Add new test cases for the reference type.

2021-11-02  Tim Horton  <timothy_horton@apple.com>

        UnicodeDecodeError in write_reftest copying a non-UTF8 expected result file

Lines 349-354 class TestImporter(object): a/Tools/Scripts/webkitpy/w3c/test_importer.py_sec1
- a/Tools/Scripts/webkitpy/w3c/test_importer.py +2 lines
349	# Using a naming convention creates duplicate copies of the	349	# Using a naming convention creates duplicate copies of the
350	# reference files.	350	# reference files.
351	ref_file = self.filesystem.splitext(test_basename)[0] + '-expected'	351	ref_file = self.filesystem.splitext(test_basename)[0] + '-expected'
		352	if test_info['type'] == 'mismatch':
		353	ref_file += '-mismatch'
352	ref_file += self.filesystem.splitext(test_info['reference'])[1]	354	ref_file += self.filesystem.splitext(test_info['reference'])[1]
353		355
354	copy_list.append({'src': test_info['reference'], 'dest': ref_file, 'reference_support_info': test_info['reference_support_info']})	356	copy_list.append({'src': test_info['reference'], 'dest': ref_file, 'reference_support_info': test_info['reference_support_info']})




            try:
                href_match_file = matches[0]['href'].strip()
                reference_type = matches[0]['rel'][0]
                if href_match_file.startswith('/'):
                    ref_file = self.filesystem.join(self.source_root_directory, href_match_file.lstrip('/'))
                else:

            if self.ref_doc is None:
                self.load_file(ref_file, True)

            test_info = {'test': self.filename, 'reference': ref_file, 'type': reference_type}

            # If the ref file does not live in the same directory as the test file, check it for support files
            test_info['reference_support_info'] = {}



        self.assertTrue('test' in test_info.keys(), 'did not find a test file')
        self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
        self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')
        self.assertTrue('type' in test_info.keys(), 'did not find a reference type')
        self.assertEqual(test_info['type'], 'match', 'reference type is not correct')
        self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')
        self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')

    def test_analyze_test_reftest_one_mismatch(self):
        test_html = """<head>
<link rel="mismatch" href="green-box-ref.xht" />
</head>
"""
        test_path = os.path.join(os.path.sep, 'some', 'madeup', 'path')
        parser = TestParser(options, os.path.join(test_path, 'somefile.html'))
        test_info = parser.analyze_test(test_contents=test_html)

        self.assertNotEqual(test_info, None, 'did not find a test')
        self.assertTrue('test' in test_info.keys(), 'did not find a test file')
        self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
        self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')
        self.assertTrue('type' in test_info.keys(), 'did not find a reference type')
        self.assertEqual(test_info['type'], 'mismatch', 'reference type is not correct')
        self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')
        self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')




2021-11-08  Manuel Rego Casasnovas  <rego@igalia.com>

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

        Reviewed by NOBODY (OOPS!).

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

        * TestExpectations:

2021-11-02  Gabriel Nava Marino  <gnavamarino@apple.com>

        Crash in RenderLayer::rebuildZOrderLists



2021-11-08  Manuel Rego Casasnovas  <rego@igalia.com>

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

        Reviewed by NOBODY (OOPS!).

        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:

2021-11-01  Michael[tm] Smith  <mike@w3.org>

        [WebInspector][CORS] Show HTTP status code in CORS messages.

Lines 3550-3556 webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font- a/LayoutTests/TestExpectations_sec1
- a/LayoutTests/TestExpectations -1 lines
3550	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-20.html [ ImageOnlyFailure ]	3550	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-20.html [ ImageOnlyFailure ]
3551	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-3.html [ ImageOnlyFailure ]	3551	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-3.html [ ImageOnlyFailure ]
3552	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4.html [ ImageOnlyFailure ]	3552	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4.html [ ImageOnlyFailure ]
3553	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5.html [ ImageOnlyFailure ]
3554	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-6.html [ ImageOnlyFailure ]	3553	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-6.html [ ImageOnlyFailure ]
3555	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-7.html [ ImageOnlyFailure ]	3554	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-7.html [ ImageOnlyFailure ]
3556	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-8.html [ ImageOnlyFailure ]	3555	webkit.org/b/206881 imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-8.html [ ImageOnlyFailure ]



<!DOCTYPE html>
<html>
<head>
<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
</head>
<body>
<div>
<div style="display: inline-block; font: 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
</div>
</body>
</html>



<!DOCTYPE html>
<html>
<head>
<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
</head>
<body>
<div>
<div style="display: inline-block; font: 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
</div>
</body>
</html>

Lines 423-429 List of files: a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/w3c-import.log_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/w3c-import.log -1 / +1 lines
423	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4-expected.html	423	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4-expected.html
424	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html	424	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4-notref.html
425	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-4.html	425	/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
427	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html	427	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-notref.html
428	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5.html	428	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5.html
429	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-6-expected.html	429	/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-6-expected.html

Return to Bug 207175

Lines 93-98 class TestParser(object): a/Tools/Scripts/webkitpy/w3c/test_parser.py_sec1
- a/Tools/Scripts/webkitpy/w3c/test_parser.py -1 / +2 lines
93		93
94	try:	94	try:
95	href_match_file = matches[0]['href'].strip()	95	href_match_file = matches[0]['href'].strip()
		96	reference_type = matches[0]['rel'][0]
96	if href_match_file.startswith('/'):	97	if href_match_file.startswith('/'):
97	ref_file = self.filesystem.join(self.source_root_directory, href_match_file.lstrip('/'))	98	ref_file = self.filesystem.join(self.source_root_directory, href_match_file.lstrip('/'))
98	else:	99	else:
Lines 108-114 class TestParser(object): a/Tools/Scripts/webkitpy/w3c/test_parser.py_sec2
108	if self.ref_doc is None:	109	if self.ref_doc is None:
109	self.load_file(ref_file, True)	110	self.load_file(ref_file, True)
110		111
111	test_info = {'test': self.filename, 'reference': ref_file}	112	test_info = {'test': self.filename, 'reference': ref_file, 'type': reference_type}
112		113
113	# If the ref file does not live in the same directory as the test file, check it for support files	114	# If the ref file does not live in the same directory as the test file, check it for support files
114	test_info['reference_support_info'] = {}	115	test_info['reference_support_info'] = {}

Lines 1-3 a/Tools/ChangeLog_sec1
- a/Tools/ChangeLog +17 lines
		1	2021-11-08 Manuel Rego Casasnovas <rego@igalia.com>
		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 NOBODY (OOPS!).
		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
1	2021-11-02 Tim Horton <timothy_horton@apple.com>	18	2021-11-02 Tim Horton <timothy_horton@apple.com>
2		19
3	UnicodeDecodeError in write_reftest copying a non-UTF8 expected result file	20	UnicodeDecodeError in write_reftest copying a non-UTF8 expected result file

Lines 53-58 class TestParserTest(unittest.TestCase): a/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py_sec1
- a/Tools/Scripts/webkitpy/w3c/test_parser_unittest.py +20 lines
53	self.assertTrue('test' in test_info.keys(), 'did not find a test file')	53	self.assertTrue('test' in test_info.keys(), 'did not find a test file')
54	self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')	54	self.assertTrue('reference' in test_info.keys(), 'did not find a reference file')
55	self.assertTrue(test_info['reference'].startswith(test_path), 'reference path is not correct')	55	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')
56	self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')	76	self.assertFalse('refsupport' in test_info.keys(), 'there should be no refsupport files for this test')
57	self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')	77	self.assertFalse('jstest' in test_info.keys(), 'test should not have been analyzed as a jstest')
58		78

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +12 lines
		1	2021-11-08 Manuel Rego Casasnovas <rego@igalia.com>
		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 NOBODY (OOPS!).
		8
		9	css/css-fonts/standard-font-family-5.html stars passing now.
		10
		11	* TestExpectations:
		12
1	2021-11-02 Gabriel Nava Marino <gnavamarino@apple.com>	13	2021-11-02 Gabriel Nava Marino <gnavamarino@apple.com>
2		14
3	Crash in RenderLayer::rebuildZOrderLists	15	Crash in RenderLayer::rebuildZOrderLists

Lines 1-3 a/LayoutTests/imported/w3c/ChangeLog_sec1
- a/LayoutTests/imported/w3c/ChangeLog +13 lines
		1	2021-11-08 Manuel Rego Casasnovas <rego@igalia.com>
		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 NOBODY (OOPS!).
		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
1	2021-11-01 Michael[tm] Smith <mike@w3.org>	14	2021-11-01 Michael[tm] Smith <mike@w3.org>
2		15
3	[WebInspector][CORS] Show HTTP status code in CORS messages.	16	[WebInspector][CORS] Show HTTP status code in CORS messages.

Line 0 a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected-mismatch.html_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/css/css-fonts/standard-font-family-5-expected-mismatch.html +11 lines
	1	<!DOCTYPE html>
	2	<html>
	3	<head>
	4	<link rel="author" title="Myles C. Maxfield" href="mailto:mmaxfield@apple.com"/>
	5	</head>
	6	<body>
	7	<div>
	8	<div style="display: inline-block; font: 72px 'ui-rounded'; font-synthesis: none;">HeJllo</div>
	9	</div>
	10	</body>
	11	</html>