W3C Importer: Consolidate and simplify logic for deciding what not to convert.

third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py

 # Copyright (C) 2013 Adobe Systems Incorporated. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 #
 # 1. Redistributions of source code must retain the above
 #    copyright notice, this list of conditions and the following
 #    disclaimer.
 # 2. Redistributions in binary form must reproduce the above
@@ skipping 48 matching lines @@
  * Also upon completion, if we are not importing the files in place, each
    directory where files are imported will have a w3c-import.log file written with
    a timestamp, the list of CSS properties used that require prefixes, the list
    of imported files, and guidance for future test modification and maintenance.
    On subsequent imports, this file is read to determine if files have been
    removed in the newer changesets. The script removes these files accordingly.
 """
 
 import logging
 import mimetypes
+import re
 import optparse
 import os
 import sys
 
 from webkitpy.common.host import Host
 from webkitpy.common.webkit_finder import WebKitFinder
 from webkitpy.layout_tests.models.test_expectations import TestExpectationParser
 from webkitpy.w3c.test_parser import TestParser
 from webkitpy.w3c.test_converter import convert_for_webkit
 
@@ skipping 318 matching lines @@
 
         relpath = self.filesystem.relpath(dest_path, self.layout_tests_dir)
         if not self.options.overwrite and self.filesystem.exists(dest_path):
             _log.info('  skipping %s', relpath)
         else:
             # FIXME: Maybe doing a file diff is in order here for existing files?
             # In other words, there's no sense in overwriting identical files, but
             # there's no harm in copying the identical thing.
             _log.info('  %s', relpath)
 
-        # Only HTML, XML, or CSS should be converted.
-        # FIXME: Eventually, so should JS when support is added for this type of conversion.
-        mimetype = mimetypes.guess_type(source_path)
-        if 'is_jstest' not in file_to_copy and (
-                'html' in str(mimetype[0]) or 'xml' in str(mimetype[0]) or 'css' in str(mimetype[0])):
+        if self.should_try_to_convert(file_to_copy, source_path, dest_dir):
             converted_file = convert_for_webkit(
                 dest_dir, filename=source_path,
                 reference_support_info=reference_support_info,
                 host=self.host)
+            for prefixed_property in converted_file[0]:
+                self._prefixed_properties.setdefault(prefixed_property, 0)
+                self._prefixed_properties[prefixed_property] += 1
 
-            if not converted_file:
-                if not self.import_in_place and not self.options.dry_run:
-                    self.filesystem.copyfile(source_path, dest_path)  # The file was unmodified.
-            else:
-                for prefixed_property in converted_file[0]:
-                    self._prefixed_properties.setdefault(prefixed_property, 0)
-                    self._prefixed_properties[prefixed_property] += 1
-
-                if not self.options.dry_run:
-                    self.filesystem.write_text_file(dest_path, converted_file[1])
+            if not self.options.dry_run:
+                self.filesystem.write_text_file(dest_path, converted_file[1])
         else:
             if not self.import_in_place and not self.options.dry_run:
                 self.filesystem.copyfile(source_path, dest_path)
                 if self.filesystem.read_binary_file(source_path)[:2] == '#!':
                     self.filesystem.make_executable(dest_path)
 
         return dest_path.replace(self._webkit_root, '')
 
+    @staticmethod
+    def should_try_to_convert(file_to_copy, source_path, dest_dir):
+        """Checks whether we should try to modify the file when importing."""
+        if file_to_copy.get('is_jstest', False):
+            return False
+
+        # Conversion is not necessary for any tests in wpt now; see http://crbug.com/654081.
+        # Note, we want to move away from converting files, see http://crbug.com/663773.
+        if re.search(r'[/\\]imported[/\\]wpt[/\\]', dest_dir):
+            return False
+
+        # Only HTML and XHTML files should be converted.

[Manuel Rego, 2016/12/01 22:00:52]

The comment doesn't match with the code,
it says HTML and XHTML, but the return line also checks if it's a CSS.

[qyearsley, 2016/12/01 22:27:53]

Done

+        mimetype, _ = mimetypes.guess_type(source_path)
+        return mimetype in ('text/html', 'application/xhtml+xml', 'text/css')
+
     def path_too_long(self, source_path):
         """Checks whether a source path is too long to import.
 
         Args:
             Absolute path of file to be imported.
 
         Returns:
             True if the path is too long to import, False if it's OK.
         """
         path_from_repo_base = os.path.relpath(source_path, self.source_repo_path)
         return len(path_from_repo_base) > MAX_PATH_LENGTH