<!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>[175204] 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/175204">175204</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-10-25 16:29:51 -0700 (Sat, 25 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Test regressions are not detected when image result is missing
https://bugs.webkit.org/show_bug.cgi?id=138070
Reviewed by Simon Fraser.
* Scripts/webkitpy/layout_tests/models/test_run_results.py:
* Scripts/webkitpy/layout_tests/views/buildbot_results.py:
Count these as regressions, not as flaky tests.
* Scripts/webkitpy/port/test.py:
* Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
Test it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy">trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy">trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testsviewsbuildbot_resultspy">trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporttestpy">trunk/Tools/Scripts/webkitpy/port/test.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (175203 => 175204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-25 22:05:57 UTC (rev 175203)
+++ trunk/Tools/ChangeLog 2014-10-25 23:29:51 UTC (rev 175204)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-10-25 Alexey Proskuryakov <ap@apple.com>
+
+ Test regressions are not detected when image result is missing
+ https://bugs.webkit.org/show_bug.cgi?id=138070
+
+ Reviewed by Simon Fraser.
+
+ * Scripts/webkitpy/layout_tests/models/test_run_results.py:
+ * Scripts/webkitpy/layout_tests/views/buildbot_results.py:
+ Count these as regressions, not as flaky tests.
+
+ * Scripts/webkitpy/port/test.py:
+ * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+ Test it.
+
</ins><span class="cx"> 2014-10-24 Timothy Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Add Conrad Shultz to the contributors list.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsmodelstest_run_resultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py (175203 => 175204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2014-10-25 22:05:57 UTC (rev 175203)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/models/test_run_results.py 2014-10-25 23:29:51 UTC (rev 175204)
</span><span class="lines">@@ -192,7 +192,9 @@
</span><span class="cx"> elif retry_results:
</span><span class="cx"> retry_result_type = retry_results.unexpected_results_by_name[test_name].type
</span><span class="cx"> if result_type != retry_result_type:
</span><del>- if enabled_pixel_tests_in_retry and result_type == test_expectations.TEXT and retry_result_type == test_expectations.IMAGE_PLUS_TEXT:
</del><ins>+ if enabled_pixel_tests_in_retry and result_type == test_expectations.TEXT and (retry_result_type == test_expectations.IMAGE_PLUS_TEXT or retry_result_type == test_expectations.MISSING):
+ if retry_result_type == test_expectations.MISSING:
+ num_missing += 1
</ins><span class="cx"> num_regressions += 1
</span><span class="cx"> test_dict['report'] = 'REGRESSION'
</span><span class="cx"> else:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (175203 => 175204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2014-10-25 22:05:57 UTC (rev 175203)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2014-10-25 23:29:51 UTC (rev 175204)
</span><span class="lines">@@ -671,6 +671,22 @@
</span><span class="cx"> self.assertFalse(json["pixel_tests_enabled"])
</span><span class="cx"> self.assertEqual(details.enabled_pixel_tests_in_retry, True)
</span><span class="cx">
</span><ins>+ def test_failed_text_with_missing_pixel_results_on_retry(self):
+ # Test what happens when pixel results are missing on retry.
+ host = MockHost()
+ details, err, _ = logging_run(['--no-show-results',
+ '--no-new-test-results', '--no-pixel-tests',
+ 'failures/unexpected/text-image-missing.html'],
+ tests_included=True, host=host)
+ file_list = host.filesystem.written_files.keys()
+ self.assertEqual(details.exit_code, 1)
+ expected_token = '"unexpected":{"text-image-missing.html":{"report":"REGRESSION","expected":"PASS","actual":"TEXT MISSING","is_missing_image":true}}'
+ json_string = host.filesystem.read_text_file('/tmp/layout-test-results/full_results.json')
+ self.assertTrue(json_string.find(expected_token) != -1)
+ self.assertTrue(json_string.find('"num_regressions":1') != -1)
+ self.assertTrue(json_string.find('"num_flaky":0') != -1)
+ self.assertTrue(json_string.find('"num_missing":1') != -1)
+
</ins><span class="cx"> def test_retrying_uses_retries_directory(self):
</span><span class="cx"> host = MockHost()
</span><span class="cx"> details, err, _ = logging_run(['--debug-rwt-logging', 'failures/unexpected/text-image-checksum.html'], tests_included=True, host=host)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testsviewsbuildbot_resultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py (175203 => 175204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py 2014-10-25 22:05:57 UTC (rev 175203)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/buildbot_results.py 2014-10-25 23:29:51 UTC (rev 175204)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> add_to_dict_of_lists(passes, 'Expected to timeout, but passed', test)
</span><span class="cx"> else:
</span><span class="cx"> add_to_dict_of_lists(passes, 'Expected to fail, but passed', test)
</span><del>- elif enabled_pixel_tests_in_retry and actual == ['TEXT', 'IMAGE+TEXT']:
</del><ins>+ elif enabled_pixel_tests_in_retry and (actual == ['TEXT', 'IMAGE+TEXT'] or actual == ['TEXT', 'MISSING']):
</ins><span class="cx"> add_to_dict_of_lists(regressions, actual[0], test)
</span><span class="cx"> elif len(actual) > 1:
</span><span class="cx"> # We group flaky tests by the first actual result we got.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporttestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/test.py (175203 => 175204)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/test.py 2014-10-25 22:05:57 UTC (rev 175203)
+++ trunk/Tools/Scripts/webkitpy/port/test.py 2014-10-25 23:29:51 UTC (rev 175204)
</span><span class="lines">@@ -100,11 +100,11 @@
</span><span class="cx"> #
</span><span class="cx"> # These numbers may need to be updated whenever we add or delete tests.
</span><span class="cx"> #
</span><del>-TOTAL_TESTS = 106
</del><ins>+TOTAL_TESTS = 107
</ins><span class="cx"> TOTAL_SKIPS = 28
</span><span class="cx"> TOTAL_RETRIES = 14
</span><span class="cx">
</span><del>-UNEXPECTED_PASSES = 6
</del><ins>+UNEXPECTED_PASSES = 7
</ins><span class="cx"> UNEXPECTED_FAILURES = 17
</span><span class="cx">
</span><span class="cx"> def unit_test_list():
</span><span class="lines">@@ -167,6 +167,9 @@
</span><span class="cx"> actual_text='text-image-checksum_fail-txt',
</span><span class="cx"> actual_image='text-image-checksum_fail-pngtEXtchecksum\x00checksum_fail',
</span><span class="cx"> actual_checksum='text-image-checksum_fail-checksum')
</span><ins>+ tests.add('failures/unexpected/text-image-missing.html',
+ actual_text='text-image-checksum_fail-txt',
+ expected_image=None)
</ins><span class="cx"> tests.add('failures/unexpected/checksum-with-matching-image.html',
</span><span class="cx"> actual_checksum='text-image-checksum_fail-checksum')
</span><span class="cx"> tests.add('failures/unexpected/skip_pass.html')
</span></span></pre>
</div>
</div>
</body>
</html>