<!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>[159978] 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/159978">159978</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 15:55:06 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Instead of a large 'if' block, each failure class should write it's own result in test_result_writer.py
https://bugs.webkit.org/show_bug.cgi?id=124714
Patch by Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu> on 2013-12-02
Reviewed by Ryosuke Niwa.
* Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
(write_test_result):
* Scripts/webkitpy/layout_tests/models/test_failures.py:
(TestFailure.write_failure):
(FailureText):
(FailureText.write_failure):
(FailureAudio):
(FailureAudio.write_failure):
(FailureCrash.write_failure):
(FailureMissingResult):
(FailureTextMismatch):
(FailureMissingImageHash.write_failure):
(FailureMissingImage.write_failure):
(FailureImageHashMismatch.write_failure):
(FailureReftestMismatch.write_failure):
(FailureReftestMismatchDidNotOccur.write_failure):
(FailureMissingAudio):
(FailureAudioMismatch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_failurespy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (159977 => 159978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-02 23:52:34 UTC (rev 159977)
+++ trunk/Tools/ChangeLog 2013-12-02 23:55:06 UTC (rev 159978)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2013-12-02 Dániel Bátyai <Batyai.Daniel@stud.u-szeged.hu>
+
+ Instead of a large 'if' block, each failure class should write it's own result in test_result_writer.py
+ https://bugs.webkit.org/show_bug.cgi?id=124714
+
+ Reviewed by Ryosuke Niwa.
+
+ * Scripts/webkitpy/layout_tests/controllers/test_result_writer.py:
+ (write_test_result):
+ * Scripts/webkitpy/layout_tests/models/test_failures.py:
+ (TestFailure.write_failure):
+ (FailureText):
+ (FailureText.write_failure):
+ (FailureAudio):
+ (FailureAudio.write_failure):
+ (FailureCrash.write_failure):
+ (FailureMissingResult):
+ (FailureTextMismatch):
+ (FailureMissingImageHash.write_failure):
+ (FailureMissingImage.write_failure):
+ (FailureImageHashMismatch.write_failure):
+ (FailureReftestMismatch.write_failure):
+ (FailureReftestMismatchDidNotOccur.write_failure):
+ (FailureMissingAudio):
+ (FailureAudioMismatch):
+
</ins><span class="cx"> 2013-12-02 László Langó <lango@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Remove the stderr_write attribute from StyleProcessorConfiguration
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollerstest_result_writerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py (159977 => 159978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2013-12-02 23:52:34 UTC (rev 159977)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/test_result_writer.py 2013-12-02 23:55:06 UTC (rev 159978)
</span><span class="lines">@@ -45,44 +45,8 @@
</span><span class="cx"> writer.write_stderr(driver_output.error)
</span><span class="cx">
</span><span class="cx"> for failure in failures:
</span><del>- # FIXME: Instead of this long 'if' block, each failure class might
- # have a responsibility for writing a test result.
- if isinstance(failure, (test_failures.FailureMissingResult,
- test_failures.FailureTextMismatch)):
- writer.write_text_files(driver_output.text, expected_driver_output.text)
- writer.create_text_diff_and_write_result(driver_output.text, expected_driver_output.text)
- elif isinstance(failure, test_failures.FailureMissingImage):
- writer.write_image_files(driver_output.image, expected_image=None)
- elif isinstance(failure, test_failures.FailureMissingImageHash):
- writer.write_image_files(driver_output.image, expected_driver_output.image)
- elif isinstance(failure, test_failures.FailureImageHashMismatch):
- writer.write_image_files(driver_output.image, expected_driver_output.image)
- writer.write_image_diff_files(driver_output.image_diff)
- elif isinstance(failure, (test_failures.FailureAudioMismatch,
- test_failures.FailureMissingAudio)):
- writer.write_audio_files(driver_output.audio, expected_driver_output.audio)
- elif isinstance(failure, test_failures.FailureCrash):
- crashed_driver_output = expected_driver_output if failure.is_reftest else driver_output
- writer.write_crash_log(crashed_driver_output.crash_log)
- elif isinstance(failure, test_failures.FailureReftestMismatch):
- writer.write_image_files(driver_output.image, expected_driver_output.image)
- # FIXME: This work should be done earlier in the pipeline (e.g., when we compare images for non-ref tests).
- # FIXME: We should always have 2 images here.
- if driver_output.image and expected_driver_output.image:
- diff_image, diff_percent, err_str = port.diff_image(expected_driver_output.image, driver_output.image, tolerance=0)
- if diff_image:
- writer.write_image_diff_files(diff_image)
- failure.diff_percent = diff_percent
- else:
- _log.warn('ref test mismatch did not produce an image diff.')
- writer.write_reftest(failure.reference_filename)
- elif isinstance(failure, test_failures.FailureReftestMismatchDidNotOccur):
- writer.write_image_files(driver_output.image, expected_image=None)
- writer.write_reftest(failure.reference_filename)
- else:
- assert isinstance(failure, (test_failures.FailureTimeout, test_failures.FailureReftestNoImagesGenerated))
</del><ins>+ failure.write_failure(writer, driver_output, expected_driver_output, port)
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class TestResultWriter(object):
</span><span class="cx"> """A class which handles all writing operations to the result directory."""
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_failurespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py (159977 => 159978)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py 2013-12-02 23:52:34 UTC (rev 159977)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_failures.py 2013-12-02 23:55:06 UTC (rev 159978)
</span><span class="lines">@@ -27,9 +27,11 @@
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx">
</span><span class="cx"> import cPickle
</span><ins>+import logging
</ins><span class="cx">
</span><span class="cx"> from webkitpy.layout_tests.models import test_expectations
</span><span class="cx">
</span><ins>+_log = logging.getLogger(__name__)
</ins><span class="cx">
</span><span class="cx"> def is_reftest_failure(failure_list):
</span><span class="cx"> failure_types = [type(f) for f in failure_list]
</span><span class="lines">@@ -107,7 +109,21 @@
</span><span class="cx"> """Returns True if we should kill DumpRenderTree/WebKitTestRunner before the next test."""
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ assert isinstance(self, (FailureTimeout, FailureReftestNoImagesGenerated))
</ins><span class="cx">
</span><ins>+
+class FailureText(TestFailure):
+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_text_files(driver_output.text, expected_driver_output.text)
+ writer.create_text_diff_and_write_result(driver_output.text, expected_driver_output.text)
+
+
+class FailureAudio(TestFailure):
+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_audio_files(driver_output.audio, expected_driver_output.audio)
+
+
</ins><span class="cx"> class FailureTimeout(TestFailure):
</span><span class="cx"> def __init__(self, is_reftest=False):
</span><span class="cx"> super(FailureTimeout, self).__init__()
</span><span class="lines">@@ -135,26 +151,37 @@
</span><span class="cx"> def driver_needs_restart(self):
</span><span class="cx"> return True
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ crashed_driver_output = expected_driver_output if self.is_reftest else driver_output
+ writer.write_crash_log(crashed_driver_output.crash_log)
</ins><span class="cx">
</span><del>-class FailureMissingResult(TestFailure):
</del><ins>+
+class FailureMissingResult(FailureText):
</ins><span class="cx"> def message(self):
</span><span class="cx"> return "-expected.txt was missing"
</span><span class="cx">
</span><span class="cx">
</span><del>-class FailureTextMismatch(TestFailure):
</del><ins>+class FailureTextMismatch(FailureText):
</ins><span class="cx"> def message(self):
</span><span class="cx"> return "text diff"
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureMissingImageHash(TestFailure):
</span><span class="cx"> def message(self):
</span><span class="cx"> return "-expected.png was missing an embedded checksum"
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_image_files(driver_output.image, expected_driver_output.image)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureMissingImage(TestFailure):
</span><span class="cx"> def message(self):
</span><span class="cx"> return "-expected.png was missing"
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_image_files(driver_output.image, expected_image=None)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureImageHashMismatch(TestFailure):
</span><span class="cx"> def __init__(self, diff_percent=0):
</span><span class="cx"> super(FailureImageHashMismatch, self).__init__()
</span><span class="lines">@@ -163,7 +190,11 @@
</span><span class="cx"> def message(self):
</span><span class="cx"> return "image diff"
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_image_files(driver_output.image, expected_driver_output.image)
+ writer.write_image_diff_files(driver_output.image_diff)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureImageHashIncorrect(TestFailure):
</span><span class="cx"> def message(self):
</span><span class="cx"> return "-expected.png embedded checksum is incorrect"
</span><span class="lines">@@ -178,7 +209,20 @@
</span><span class="cx"> def message(self):
</span><span class="cx"> return "reference mismatch"
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_image_files(driver_output.image, expected_driver_output.image)
+ # FIXME: This work should be done earlier in the pipeline (e.g., when we compare images for non-ref tests).
+ # FIXME: We should always have 2 images here.
+ if driver_output.image and expected_driver_output.image:
+ diff_image, diff_percent, err_str = port.diff_image(expected_driver_output.image, driver_output.image, tolerance=0)
+ if diff_image:
+ writer.write_image_diff_files(diff_image)
+ self.diff_percent = diff_percent
+ else:
+ _log.warn('ref test mismatch did not produce an image diff.')
+ writer.write_reftest(self.reference_filename)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class FailureReftestMismatchDidNotOccur(TestFailure):
</span><span class="cx"> def __init__(self, reference_filename=None):
</span><span class="cx"> super(FailureReftestMismatchDidNotOccur, self).__init__()
</span><span class="lines">@@ -187,6 +231,9 @@
</span><span class="cx"> def message(self):
</span><span class="cx"> return "reference mismatch didn't happen"
</span><span class="cx">
</span><ins>+ def write_failure(self, writer, driver_output, expected_driver_output, port):
+ writer.write_image_files(driver_output.image, expected_image=None)
+ writer.write_reftest(self.reference_filename)
</ins><span class="cx">
</span><span class="cx"> class FailureReftestNoImagesGenerated(TestFailure):
</span><span class="cx"> def __init__(self, reference_filename=None):
</span><span class="lines">@@ -197,12 +244,12 @@
</span><span class="cx"> return "reference didn't generate pixel results."
</span><span class="cx">
</span><span class="cx">
</span><del>-class FailureMissingAudio(TestFailure):
</del><ins>+class FailureMissingAudio(FailureAudio):
</ins><span class="cx"> def message(self):
</span><span class="cx"> return "expected audio result was missing"
</span><span class="cx">
</span><span class="cx">
</span><del>-class FailureAudioMismatch(TestFailure):
</del><ins>+class FailureAudioMismatch(FailureAudio):
</ins><span class="cx"> def message(self):
</span><span class="cx"> return "audio mismatch"
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>