<!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>[174161] 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/174161">174161</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-01 10:52:06 -0700 (Wed, 01 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>commitqueuetasks_unittest does not construct FailingTestCommitQueue
objects properly in its test cases.
https://bugs.webkit.org/show_bug.cgi?id=137281
Patch by Jake Nielsen <jacob_nielsen@apple.com> on 2014-10-01
Reviewed by Daniel Bates.
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
(FailingTestCommitQueue.test_results):
Adds an assert to make FailingTestCommitQueue harder to mis-use.
(test_double_flaky_test_failure):
Nests the intended test failure strings into one-length lists.
(test_red_test_failure):
Nests the intended test failure strings into one-length lists.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotcommitqueuetask_unittestpy">trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (174160 => 174161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-10-01 17:35:59 UTC (rev 174160)
+++ trunk/Tools/ChangeLog 2014-10-01 17:52:06 UTC (rev 174161)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-10-01 Jake Nielsen <jacob_nielsen@apple.com>
+
+ commitqueuetasks_unittest does not construct FailingTestCommitQueue
+ objects properly in its test cases.
+ https://bugs.webkit.org/show_bug.cgi?id=137281
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ (FailingTestCommitQueue.test_results):
+ Adds an assert to make FailingTestCommitQueue harder to mis-use.
+ (test_double_flaky_test_failure):
+ Nests the intended test failure strings into one-length lists.
+ (test_red_test_failure):
+ Nests the intended test failure strings into one-length lists.
+
</ins><span class="cx"> 2014-10-01 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r172172): Multiple regression tests fail when primary system language is Russian
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotcommitqueuetask_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (174160 => 174161)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-10-01 17:35:59 UTC (rev 174160)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-10-01 17:52:06 UTC (rev 174161)
</span><span class="lines">@@ -110,6 +110,7 @@
</span><span class="cx"> # Doesn't make sense to ask for the test_results until the tests have run at least once.
</span><span class="cx"> assert(self._test_run_counter >= 0)
</span><span class="cx"> failures_for_run = self._test_failure_plan[self._test_run_counter]
</span><ins>+ assert(isinstance(failures_for_run, list))
</ins><span class="cx"> results = LayoutTestResults(test_results=map(self._mock_test_result, failures_for_run), did_exceed_test_failure_limit=(len(self._test_failure_plan[self._test_run_counter]) >= 10))
</span><span class="cx"> return results
</span><span class="cx">
</span><span class="lines">@@ -344,9 +345,9 @@
</span><span class="cx"> ScriptError("MOCK test failure"),
</span><span class="cx"> ScriptError("MOCK test failure again"),
</span><span class="cx"> ], [
</span><del>- "foo.html",
- "bar.html",
- "foo.html",
</del><ins>+ ["foo.html"],
+ ["bar.html"],
+ ["foo.html"],
</ins><span class="cx"> ])
</span><span class="cx"> # The (subtle) point of this test is that report_flaky_tests does not appear
</span><span class="cx"> # in the expected_logs for this run.
</span><span class="lines">@@ -415,9 +416,9 @@
</span><span class="cx"> ScriptError("MOCK test failure again"),
</span><span class="cx"> ScriptError("MOCK clean test failure"),
</span><span class="cx"> ], [
</span><del>- "foo.html",
- "foo.html",
- "foo.html",
</del><ins>+ ["foo.html"],
+ ["foo.html"],
+ ["foo.html"],
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> # Tests always fail, and always return the same results, but we
</span></span></pre>
</div>
</div>
</body>
</html>