W3C test importer: Skip importing files whose ref files would be too long.

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

Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
index eec089e72d90cc525ebc1a2fca1d452dd76657ee..0f31e097b0cc9b91cd1f27350462ac8c2bc60362 100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer.py
@@ -245,11 +245,14 @@ class TestImporter(object):
                 if test_info is None:
                     continue
 
+                if self.path_too_long(path_full):
+                    _log.warning('%s skipped due to long path. '
+                                 'Max length from repo base %d chars; see http://crbug.com/609871.',
+                                 path_full, MAX_PATH_LENGTH)
+                    continue

[qyearsley, 2016/05/20 21:09:46]

The skipping has been moved from import_tests to find_importable_tests.

+
                 if 'reference' in test_info.keys():
-                    reftests += 1
-                    total_tests += 1
                     test_basename = self.filesystem.basename(test_info['test'])
-
                     # Add the ref file, following WebKit style.
                     # FIXME: Ideally we'd support reading the metadata
                     # directly rather than relying  on a naming convention.
@@ -261,6 +264,14 @@ class TestImporter(object):
                     # references but HTML tests.
                     ref_file += self.filesystem.splitext(test_info['reference'])[1]
 
+                    if self.path_too_long(path_full.replace(filename, ref_file)):
+                        _log.warning('%s skipped because path of ref file %s would be too long. '
+                                     'Max length from repo base %d chars; see http://crbug.com/609871.',
+                                     path_full, ref_file, MAX_PATH_LENGTH)
+                        continue

[qyearsley, 2016/05/20 21:09:46]

This should skip importing in the case where the path of the file is not too
long, but the reference file would be too long.

 path_full is the absolute path to the test file
 filename is the basename (without directory) of the test file
 ref_file is the basename (without directory) of the reference file (which my
have a different extension than the test file).

This could hopefully be made simpler to understand if (1) the functions here
were made shorter and (2) the variable names were improved. I'd like to do that
in follow-up CLs.

+
+                    reftests += 1
+                    total_tests += 1
                     copy_list.append({'src': test_info['reference'], 'dest': ref_file,
                                       'reference_support_info': test_info['reference_support_info']})
                     copy_list.append({'src': test_info['test'], 'dest': filename})
@@ -335,11 +346,6 @@ class TestImporter(object):
                     _log.warning('%s not found. Possible error in the test.', orig_filepath)
                     continue
 
-                if self.path_too_long(orig_filepath):
-                    _log.warning('%s skipped (longer than %d chars), to avoid hitting Windows max path length on builders (http://crbug.com/609871).',
-                                 orig_filepath, MAX_PATH_LENGTH)
-                    continue
-
                 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']