Changeset 180844 in webkit

Timestamp:

Feb 28, 2015 2:47:40 PM (9 years ago)

Author:

youenn.fablet@crf.canon.fr

Message:

W3C importer should use filesystem instead of shutil/host
​https://bugs.webkit.org/show_bug.cgi?id=142012

Reviewed by Bem Jones-Bey.

Removed direct use of python shutil and os, except for os.walk which will require its own fix.

• Scripts/webkitpy/w3c/test_importer.py:

(main):
(TestImporter.do_import):
(TestImporter.find_importable_tests):
(TestImporter.import_tests):
(TestImporter.remove_deleted_files):
(TestImporter.write_import_log):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2015-02-28  Youenn Fablet  <youenn.fablet@crf.canon.fr>
+
+        W3C importer should use filesystem instead of shutil/host
+        https://bugs.webkit.org/show_bug.cgi?id=142012
+
+        Reviewed by Bem Jones-Bey.
+
+        Removed direct use of python shutil and os, except for os.walk which will require its own fix.
+
+        * Scripts/webkitpy/w3c/test_importer.py:
+        (main):
+        (TestImporter.do_import):
+        (TestImporter.find_importable_tests):
+        (TestImporter.import_tests):
+        (TestImporter.remove_deleted_files):
+        (TestImporter.write_import_log):
+
 2015-02-28  Youenn Fablet  <youenn.fablet@crf.canon.fr>
 

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

@@ -69 +69 @@
 """
 
-# FIXME: Change this file to use the Host abstractions rather that os, sys, shutils, etc.
-
 import argparse
 import datetime
@@ -76 +74 @@
 import mimetypes
 import os
-import shutil
 import sys
 
 from webkitpy.common.host import Host
+from webkitpy.common.system.filesystem import FileSystem
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.common.system.executive import ScriptError
@@ -93 +91 @@
     options, args = parse_args(_argv)
     import_dir = args[0]
-
-    if not os.path.exists(import_dir):
+    filesystem = FileSystem()
+    if not filesystem.exists(import_dir):
         sys.exit('Source directory %s not found!' % import_dir)
 
@@ -161 +159 @@
         else:
             for test_path in self.options.test_paths:
-                self.find_importable_tests(os.path.join(self.source_directory, test_path))
+                self.find_importable_tests(self.filesystem.join(self.source_directory, test_path))
         self.import_tests()
 
@@ -195 +193 @@
                     continue
 
-                fullpath = os.path.join(root, filename)
+                fullpath = self.filesystem.join(root, filename)
 
                 mimetype = mimetypes.guess_type(fullpath)
@@ -206 +204 @@
                 if test_info is None:
                     # If html file is in a "resources" folder, it should be copied anyway
-                    if os.path.basename(os.path.dirname(fullpath)) == "resources":
+                    if self.filesystem.basename(self.filesystem.dirname(fullpath)) == "resources":
                         copy_list.append({'src': fullpath, 'dest': filename})
                     continue
@@ -213 +211 @@
                     reftests += 1
                     total_tests += 1
-                    test_basename = os.path.basename(test_info['test'])
+                    test_basename = self.filesystem.basename(test_info['test'])
 
                     # Add the ref file, following WebKit style.
@@ -220 +218 @@
                     # Using a naming convention creates duplicate copies of the
                     # reference files.
-                    ref_file = os.path.splitext(test_basename)[0] + '-expected'
-                    ref_file += os.path.splitext(test_basename)[1]
+                    ref_file = self.filesystem.splitext(test_basename)[0] + '-expected'
+                    ref_file += self.filesystem.splitext(test_basename)[1]
 
                     copy_list.append({'src': test_info['reference'], 'dest': ref_file, 'reference_support_info': test_info['reference_support_info']})
@@ -261 +259 @@
             orig_path = dir_to_copy['dirname']
 
-            subpath = os.path.relpath(orig_path, self.source_directory)
-            new_path = os.path.join(self.destination_directory, subpath)
-
-            if not(os.path.exists(new_path)):
-                os.makedirs(new_path)
+            subpath = self.filesystem.relpath(orig_path, self.source_directory)
+            new_path = self.filesystem.join(self.destination_directory, subpath)
+
+            if not(self.filesystem.exists(new_path)):
+                self.filesystem.maybe_make_directory(new_path)
 
             copied_files = []
@@ -271 +269 @@
             for file_to_copy in dir_to_copy['copy_list']:
                 # FIXME: Split this block into a separate function.
-                orig_filepath = os.path.normpath(file_to_copy['src'])
-
-                if os.path.isdir(orig_filepath):
+                orig_filepath = self.filesystem.normpath(file_to_copy['src'])
+
+                if self.filesystem.isdir(orig_filepath):
                     # FIXME: Figure out what is triggering this and what to do about it.
                     _log.error('%s refers to a directory' % orig_filepath)
                     continue
 
-                if not(os.path.exists(orig_filepath)):
+                if not(self.filesystem.exists(orig_filepath)):
                     _log.warning('%s not found. Possible error in the test.', orig_filepath)
                     continue
 
-                new_filepath = os.path.join(new_path, file_to_copy['dest'])
+                new_filepath = self.filesystem.join(new_path, file_to_copy['dest'])
                 if 'reference_support_info' in file_to_copy.keys() and file_to_copy['reference_support_info'] != {}:
                     reference_support_info = file_to_copy['reference_support_info']
@@ -288 +286 @@
                     reference_support_info = None
 
-                if not(os.path.exists(os.path.dirname(new_filepath))):
-                    os.makedirs(os.path.dirname(new_filepath))
-
-                if not self.options.overwrite and os.path.exists(new_filepath):
+                if not(self.filesystem.exists(self.filesystem.dirname(new_filepath))):
+                    self.filesystem.maybe_make_directory(self.filesystem.dirname(new_filepath))
+
+                if not self.options.overwrite and self.filesystem.exists(new_filepath):
                     _log.info('Skipping import of existing file ' + new_filepath)
                 else:
@@ -312 +310 @@
 
                     if not converted_file:
-                        shutil.copyfile(orig_filepath, new_filepath)  # The file was unmodified.
+                        self.filesystem.copyfile(orig_filepath, new_filepath)  # The file was unmodified.
                     else:
                         for prefixed_property in converted_file[0]:
@@ -331 +329 @@
                     self.filesystem.write_text_file(new_filepath, '# This file is required for Python to search this directory for modules.')
                 else:
-                    shutil.copyfile(orig_filepath, new_filepath)
+                    self.filesystem.copyfile(orig_filepath, new_filepath)
 
                 copied_files.append(new_filepath.replace(self._webkit_root, ''))
@@ -362 +360 @@
         previous_file_list = []
 
-        import_log_file = os.path.join(import_directory, 'w3c-import.log')
-        if not os.path.exists(import_log_file):
+        import_log_file = self.filesystem.join(import_directory, 'w3c-import.log')
+        if not self.filesystem.exists(import_log_file):
             return
 
@@ -375 +373 @@
         for deleted_file in deleted_files:
             _log.info('Deleting file removed from the W3C repo: %s', deleted_file)
-            deleted_file = os.path.join(self._webkit_root, deleted_file)
-            os.remove(deleted_file)
+            deleted_file = self.filesystem.join(self._webkit_root, deleted_file)
+            self.filesystem.remove(deleted_file)
 
     def write_import_log(self, import_directory, file_list, prop_list, property_values_list):