Changeset 205453 in webkit

Timestamp:

Sep 5, 2016 7:34:09 AM (8 years ago)

Author:

commit-queue@webkit.org

Message:

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

Unreviewed.

Patch by Youenn Fablet <​youenn@apple.com> 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.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/w3c/test_importer.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-09-05  Youenn Fablet  <youenn@apple.com>
+
+        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  <pnormand@igalia.com>
 

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

@@ -181 +181 @@
         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"] = []