Remove usage of TestParser from test_copier.py.

Remove usage of TestParser from test_copier.py.

This wouldn't yet allow us to remove TestParser, since it's also used
in wpt_expectations_updater.py currently.

BUG=706919
Review-Url: https://codereview.chromium.org/2786013003
Cr-Commit-Position: refs/heads/master@{#461013}
Committed: https://chromium.googlesource.com/chromium/src/+/904a97549b34407f69820f1ff114c861f9c35bf6

[qyearsley, 2017-03-30 19:37:49]

qyearsley@chromium.org changed reviewers:
+ tkent@chromium.org

[tkent, 2017-03-30 23:09:46]

lgtm.

Showing the numbers of imported tests isn't helpful, and it's ok to remove it.

[qyearsley, 2017-03-30 23:19:39]

The CQ bit was checked by qyearsley@chromium.org

[commit-bot: I haz the power, 2017-03-30 23:20:59]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-31 01:23:37]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-31 01:23:38]

Failed to apply patch for
third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py:
While running git apply --index -3 -p1;
  error: patch failed:
third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py:37
  Falling back to three-way merge...
  Applied patch to
'third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py' with conflicts.
  U third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py

Patch:       third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
Index: third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
index
2a336d065962cdf1b54a9199d2513dc498317a58..963a1a18ddba52b055778c0f880e1eb427dd46d8
100644
--- a/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
+++ b/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_copier.py
@@ -37,7 +37,6 @@ import re
 
 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
 
 _log = logging.getLogger(__name__)
@@ -95,18 +94,11 @@ class TestCopier(object):
         for root, dirs, files in self.filesystem.walk(self.source_repo_path):
             cur_dir = root.replace(self.dir_above_repo + '/', '') + '/'
             _log.debug('Scanning %s...', cur_dir)
-            total_tests = 0
-            reftests = 0
-            jstests = 0
 
             # Files in 'tools' are not for browser testing, so we skip them.
             # See:
http://web-platform-tests.org/writing-tests/general-guidelines.html#tools
             dirs_to_skip = ('.git', 'test-plan', 'tools')
 
-            # We copy all files in 'support', including HTML without metadata.
-            # See:
http://web-platform-tests.org/writing-tests/general-guidelines.html#support-f...
-            dirs_to_include = ('resources', 'support')
-
             if dirs:
                 for name in dirs_to_skip:
                     if name in dirs:
@@ -149,43 +141,11 @@ class TestCopier(object):
                     _log.debug('  Reason: This file may cause Chromium
presubmit to fail.')
                     continue
 
-                mimetype = mimetypes.guess_type(path_full)
-                if ('html' not in str(mimetype[0]) and
-                        'application/xhtml+xml' not in str(mimetype[0]) and
-                        'application/xml' not in str(mimetype[0])):
-                    copy_list.append({'src': path_full, 'dest': filename})
-                    continue
-
-                if self.filesystem.basename(root) in dirs_to_include:
-                    copy_list.append({'src': path_full, 'dest': filename})
-                    continue
-
-                test_parser = TestParser(path_full, self.host)
-                test_info = test_parser.analyze_test()
-                if test_info is None:
-                    copy_list.append({'src': path_full, 'dest': filename})
-                    continue
-
-                if 'reference' in test_info.keys():
-                    ref_path_full = test_info['reference']
-                    if not self.filesystem.exists(ref_path_full):
-                        _log.warning('Skipping: %s', path_full)
-                        _log.warning('  Reason: Ref file "%s" was not found.',
ref_path_full)
-                        continue
-
-                    reftests += 1
-                    total_tests += 1
-                    copy_list.append({'src': test_info['test'], 'dest':
filename})
-
-                elif 'jstest' in test_info.keys():
-                    jstests += 1
-                    total_tests += 1
-                    copy_list.append({'src': path_full, 'dest': filename,
'is_jstest': True})
+                copy_list.append({'src': path_full, 'dest': filename})
 
             if copy_list:
                 # Only add this directory to the list if there's something to
import
-                self.import_list.append({'dirname': root, 'copy_list':
copy_list,
-                                         'reftests': reftests, 'jstests':
jstests, 'total_tests': total_tests})
+                self.import_list.append({'dirname': root, 'copy_list':
copy_list})
 
     def find_paths_to_skip(self):
         paths_to_skip = set()
@@ -204,15 +164,7 @@ class TestCopier(object):
 
     def import_tests(self):
         """Reads |self.import_list|, and converts and copies files to their
destination."""
-        total_imported_tests = 0
-        total_imported_reftests = 0
-        total_imported_jstests = 0
-
         for dir_to_copy in self.import_list:
-            total_imported_tests += dir_to_copy['total_tests']
-            total_imported_reftests += dir_to_copy['reftests']
-            total_imported_jstests += dir_to_copy['jstests']
-
             if not dir_to_copy['copy_list']:
                 continue
 
@@ -234,11 +186,6 @@ class TestCopier(object):
         _log.info('')
         _log.info('Import complete')
         _log.info('')
-        _log.info('IMPORTED %d TOTAL TESTS', total_imported_tests)
-        _log.info('Imported %d reftests', total_imported_reftests)
-        _log.info('Imported %d JS tests', total_imported_jstests)
-        _log.info('Imported %d pixel/manual tests', total_imported_tests -
total_imported_jstests - total_imported_reftests)
-        _log.info('')
 
         if self._prefixed_properties:
             _log.info('Properties needing prefixes (by count):')

[qyearsley, 2017-03-31 02:03:06]

The CQ bit was checked by qyearsley@chromium.org

[qyearsley, 2017-03-31 02:03:06]

The patchset sent to the CQ was uploaded after l-g-t-m from tkent@chromium.org
Link to the patchset: https://codereview.chromium.org/2786013003/#ps20001
(title: "Rebase")

[commit-bot: I haz the power, 2017-03-31 02:03:56]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-31 03:31:01]

CQ is committing da patch.

Bot data: {"patchset_id": 20001, "attempt_start_ts": 1490925786437950,
"parent_rev": "8393de464114cb0a3d5e82a93a491728aa49e043", "commit_rev":
"904a97549b34407f69820f1ff114c861f9c35bf6"}

[commit-bot: I haz the power, 2017-03-31 03:31:49]

Description was changed from

==========
Remove usage of TestParser from test_copier.py.

This wouldn't yet allow us to remove TestParser, since it's also used
in wpt_expectations_updater.py currently.

BUG=706919
==========

to

==========
Remove usage of TestParser from test_copier.py.

This wouldn't yet allow us to remove TestParser, since it's also used
in wpt_expectations_updater.py currently.

BUG=706919

Review-Url: https://codereview.chromium.org/2786013003
Cr-Commit-Position: refs/heads/master@{#461013}
Committed:
https://chromium.googlesource.com/chromium/src/+/904a97549b34407f69820f1ff114...
==========

[commit-bot: I haz the power, 2017-03-31 03:31:50]

Committed patchset #2 (id:20001) as
https://chromium.googlesource.com/chromium/src/+/904a97549b34407f69820f1ff114...