Title: [205453] trunk/Tools
Revision
205453
Author
[email protected]
Date
2016-09-05 07:34:09 -0700 (Mon, 05 Sep 2016)

Log Message

Fix W3C test importer unit tests after r205447
https://bugs.webkit.org/show_bug.cgi?id=161604

Unreviewed.

Patch by Youenn Fablet <[email protected]> on 2016-09-05

* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.__init__): Skip cleaning test_resource_files files if resource-files.json cannot be read.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (205452 => 205453)


--- trunk/Tools/ChangeLog	2016-09-05 14:22:07 UTC (rev 205452)
+++ trunk/Tools/ChangeLog	2016-09-05 14:34:09 UTC (rev 205453)
@@ -1,3 +1,13 @@
+2016-09-05  Youenn Fablet  <[email protected]>
+
+        Fix W3C test importer unit tests after r205447
+        https://bugs.webkit.org/show_bug.cgi?id=161604
+
+        Unreviewed.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (TestImporter.__init__): Skip cleaning test_resource_files files if resource-files.json cannot be read.
+
 2016-09-05  Philippe Normand  <[email protected]>
 
         WebRTC: Several media stream tests crashing

Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (205452 => 205453)


--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py	2016-09-05 14:22:07 UTC (rev 205452)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py	2016-09-05 14:34:09 UTC (rev 205453)
@@ -180,7 +180,7 @@
 
         self._test_resource_files_json_path = self.filesystem.join(self.layout_tests_w3c_path, "resources", "resource-files.json")
         self._test_resource_files = json.loads(self.filesystem.read_text_file(self._test_resource_files_json_path)) if self.filesystem.exists(self._test_resource_files_json_path) else None
-        if self.options.clean_destination_directory:
+        if self.options.clean_destination_directory and self._test_resource_files:
             self._test_resource_files["files"] = []
 
     def do_import(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to