<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169347] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169347">169347</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-26 09:11:12 -0700 (Mon, 26 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>W3C test importer should catch exceptions coming from HTML/CSS conversion
https://bugs.webkit.org/show_bug.cgi?id=133176
Patch by Youenn Fablet <youenn.fablet@crf.canon.fr> on 2014-05-26
Reviewed by Darin Adler.
Exceptions raised when converting HTML/CSS are caught.
Files for which conversion failed are still copied to the target directory.
Each individual conversion failure is logged.
Total conversion failure number is logged at the end of the import process.
* Scripts/webkitpy/w3c/test_importer.py:
(TestImporter.import_tests):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyw3ctest_importerpy">trunk/Tools/Scripts/webkitpy/w3c/test_importer.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (169346 => 169347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-26 16:08:16 UTC (rev 169346)
+++ trunk/Tools/ChangeLog 2014-05-26 16:11:12 UTC (rev 169347)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-26 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ W3C test importer should catch exceptions coming from HTML/CSS conversion
+ https://bugs.webkit.org/show_bug.cgi?id=133176
+
+ Reviewed by Darin Adler.
+
+ Exceptions raised when converting HTML/CSS are caught.
+ Files for which conversion failed are still copied to the target directory.
+ Each individual conversion failure is logged.
+ Total conversion failure number is logged at the end of the import process.
+
+ * Scripts/webkitpy/w3c/test_importer.py:
+ (TestImporter.import_tests):
+
</ins><span class="cx"> 2014-05-26 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Allow to run the tests on the native X display.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyw3ctest_importerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/w3c/test_importer.py (169346 => 169347)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-05-26 16:08:16 UTC (rev 169346)
+++ trunk/Tools/Scripts/webkitpy/w3c/test_importer.py 2014-05-26 16:11:12 UTC (rev 169347)
</span><span class="lines">@@ -310,6 +310,7 @@
</span><span class="cx"> os.makedirs(new_path)
</span><span class="cx">
</span><span class="cx"> copied_files = []
</span><ins>+ failed_conversion_files = []
</ins><span class="cx">
</span><span class="cx"> for file_to_copy in dir_to_copy['copy_list']:
</span><span class="cx"> # FIXME: Split this block into a separate function.
</span><span class="lines">@@ -342,7 +343,11 @@
</span><span class="cx"> # FIXME: Eventually, so should js when support is added for this type of conversion
</span><span class="cx"> mimetype = mimetypes.guess_type(orig_filepath)
</span><span class="cx"> if 'html' in str(mimetype[0]) or 'xml' in str(mimetype[0]) or 'css' in str(mimetype[0]):
</span><del>- converted_file = convert_for_webkit(new_path, filename=orig_filepath)
</del><ins>+ try:
+ converted_file = convert_for_webkit(new_path, filename=orig_filepath)
+ except:
+ _log.warn('Failed converting %s', orig_filepath)
+ failed_conversion_files.append(orig_filepath)
</ins><span class="cx">
</span><span class="cx"> if not converted_file:
</span><span class="cx"> shutil.copyfile(orig_filepath, new_filepath) # The file was unmodified.
</span><span class="lines">@@ -369,8 +374,11 @@
</span><span class="cx"> _log.info('Imported %d reftests', total_imported_reftests)
</span><span class="cx"> _log.info('Imported %d JS tests', total_imported_jstests)
</span><span class="cx"> _log.info('Imported %d pixel/manual tests', total_imported_tests - total_imported_jstests - total_imported_reftests)
</span><ins>+ if len(failed_conversion_files):
+ _log.warn('Failed converting %d files (files copied without being converted)', len(failed_conversion_files))
</ins><span class="cx"> _log.info('')
</span><span class="cx"> _log.info('Properties needing prefixes (by count):')
</span><ins>+
</ins><span class="cx"> for prefixed_property in sorted(total_prefixed_properties, key=lambda p: total_prefixed_properties[p]):
</span><span class="cx"> _log.info(' %s: %s', prefixed_property, total_prefixed_properties[prefixed_property])
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>