Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Unified Diff: Tools/Scripts/webkitpy/w3c/test_importer.py

Issue 148173016: Checkpoint work to import new tests from the w3c repos. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: update W3CImportExpectations, add --allow-local-blink-commits, other fixes Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Tools/Scripts/update-w3c-deps ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/w3c/test_importer.py
diff --git a/Tools/Scripts/webkitpy/w3c/test_importer.py b/Tools/Scripts/webkitpy/w3c/test_importer.py
index bec97f838b3bdcf2ae9a042240fbb24154b3c94b..2bccbbd028bce16f447d9c3bdc71e7e1c8127e27 100644
--- a/Tools/Scripts/webkitpy/w3c/test_importer.py
+++ b/Tools/Scripts/webkitpy/w3c/test_importer.py
@@ -194,7 +194,7 @@ class TestImporter(object):
for root, dirs, files in os.walk(directory):
cur_dir = root.replace(self.layout_tests_dir + '/', '') + '/'
- _log.info('Scanning ' + cur_dir + '...')
+ _log.info(' scanning ' + cur_dir + '...')
total_tests = 0
reftests = 0
jstests = 0
@@ -214,7 +214,7 @@ class TestImporter(object):
if path_base in dirs:
dirs.remove(path_base)
if not self.options.dry_run and self.import_in_place:
- _log.info("Pruning %s" % path_full)
+ _log.info(" pruning %s" % path_base)
self.filesystem.rmtree(path_full)
copy_list = []
@@ -224,7 +224,7 @@ class TestImporter(object):
path_base = path_full.replace(self.layout_tests_dir + '/', '')
if path_base in paths_to_skip:
if not self.options.dry_run and self.import_in_place:
- _log.info("Pruning %s" % path_base)
+ _log.info(" pruning %s" % path_base)
self.filesystem.remove(path_full)
continue
# FIXME: This block should really be a separate function, but the early-continues make that difficult.
@@ -358,13 +358,12 @@ class TestImporter(object):
os.makedirs(os.path.dirname(new_filepath))
if not self.options.overwrite and os.path.exists(new_filepath):
- _log.info('Skipping import of existing file ' + new_filepath)
+ _log.info(' skipping import of existing file ' + new_filepath)
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('Importing: %s', orig_filepath)
- _log.info(' As: %s', new_filepath)
+ _log.info(' importing %s', os.path.relpath(new_filepath, self.layout_tests_dir))
# Only html, xml, or css should be converted
# FIXME: Eventually, so should js when support is added for this type of conversion
@@ -395,8 +394,9 @@ class TestImporter(object):
self.remove_deleted_files(new_path, copied_files)
self.write_import_log(new_path, copied_files, prefixed_properties)
+ _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)
« no previous file with comments | « Tools/Scripts/update-w3c-deps ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698