Title: [246469] trunk/Tools
- Revision
- 246469
- Author
- [email protected]
- Date
- 2019-06-15 21:46:16 -0700 (Sat, 15 Jun 2019)
Log Message
WPT test importer WTR option reader should not throw if the file is not proper UTF-8
https://bugs.webkit.org/show_bug.cgi?id=198780
Reviewed by Jonathan Bedard.
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter._webkit_test_runner_options):
In case the test file cannot be read as text, consider that there is no WTR option.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (246468 => 246469)
--- trunk/Tools/ChangeLog 2019-06-15 19:30:06 UTC (rev 246468)
+++ trunk/Tools/ChangeLog 2019-06-16 04:46:16 UTC (rev 246469)
@@ -1,3 +1,14 @@
+2019-06-15 Youenn Fablet <[email protected]>
+
+ WPT test importer WTR option reader should not throw if the file is not proper UTF-8
+ https://bugs.webkit.org/show_bug.cgi?id=198780
+
+ Reviewed by Jonathan Bedard.
+
+ * Scripts/webkitpy/w3c/test_importer.py:
+ (TestImporter._webkit_test_runner_options):
+ In case the test file cannot be read as text, consider that there is no WTR option.
+
2019-06-14 Youenn Fablet <[email protected]>
WebResourceLoadStatisticsStore should not use its network session if invalidated
Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (246468 => 246469)
--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2019-06-15 19:30:06 UTC (rev 246468)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2019-06-16 04:46:16 UTC (rev 246469)
@@ -365,7 +365,12 @@
return ''
options_prefix = '<!-- webkit-test-runner'
- contents = self.filesystem.read_text_file(path).split('\n')
+ contents = ''
+ try:
+ contents = self.filesystem.read_text_file(path).split('\n')
+ except:
+ _log.info('unable to read %s as a text file' % path)
+
if not len(contents):
return ''
first_line = contents[0]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
