<!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>[204230] 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/204230">204230</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-08-06 12:33:10 -0700 (Sat, 06 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EWS Style Queue fails to process patches which fails validation
https://bugs.webkit.org/show_bug.cgi?id=160632
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/tool/bot/stylequeuetask.py:
(StyleQueueTask.validate): Add more information about validation failure.
(StyleQueueTask.run): Pass the error details in the PatchIsNotValid exception.
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(test_non_valid_patch): Add a unit test to test the above code path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotstylequeuetaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204229 => 204230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-06 18:23:15 UTC (rev 204229)
+++ trunk/Tools/ChangeLog 2016-08-06 19:33:10 UTC (rev 204230)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-06 Aakash Jain <aakash_jain@apple.com>
+
+ EWS Style Queue fails to process patches which fails validation
+ https://bugs.webkit.org/show_bug.cgi?id=160632
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/tool/bot/stylequeuetask.py:
+ (StyleQueueTask.validate): Add more information about validation failure.
+ (StyleQueueTask.run): Pass the error details in the PatchIsNotValid exception.
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (test_non_valid_patch): Add a unit test to test the above code path.
+
</ins><span class="cx"> 2016-08-06 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> WTF needs a variant implementation
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotstylequeuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py (204229 => 204230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2016-08-06 18:23:15 UTC (rev 204229)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2016-08-06 19:33:10 UTC (rev 204230)
</span><span class="lines">@@ -38,10 +38,13 @@
</span><span class="cx"> def validate(self):
</span><span class="cx"> self._patch = self._delegate.refetch_patch(self._patch)
</span><span class="cx"> if self._patch.is_obsolete():
</span><ins>+ self.error = "Patch is obsolete."
</ins><span class="cx"> return False
</span><span class="cx"> if self._patch.bug().is_closed():
</span><ins>+ self.error = "Bug is already closed."
</ins><span class="cx"> return False
</span><span class="cx"> if self._patch.review() == "-":
</span><ins>+ self.error = "Patch is marked r-."
</ins><span class="cx"> return False
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="lines">@@ -64,7 +67,7 @@
</span><span class="cx">
</span><span class="cx"> def run(self):
</span><span class="cx"> if not self.validate():
</span><del>- raise PatchIsNotValid(self._patch)
</del><ins>+ raise PatchIsNotValid(self._patch, self.error)
</ins><span class="cx"> if not self._clean():
</span><span class="cx"> return False
</span><span class="cx"> if not self._update():
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (204229 => 204230)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-08-06 18:23:15 UTC (rev 204229)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-08-06 19:33:10 UTC (rev 204230)
</span><span class="lines">@@ -534,3 +534,14 @@
</span><span class="cx"> }
</span><span class="cx"> tool = MockTool(executive_throws_when_run=set(['apply-watchlist-local']))
</span><span class="cx"> self.assert_queue_outputs(StyleQueue(host=MockHost()), expected_logs=expected_logs, tool=tool)
</span><ins>+
+ def test_non_valid_patch(self):
+ tool = MockTool()
+ patch = tool.bugs.fetch_attachment(10007) # _patch8, resolved bug, without review flag, not marked obsolete (maybe already landed)
+ expected_logs = {
+ "begin_work_queue": self._default_begin_work_queue_logs("style-queue"),
+ "process_work_item": """MOCK: update_status: style-queue Error: style-queue did not process patch. Reason: Bug is already closed.
+MOCK: release_work_item: style-queue 10007
+""",
+ }
+ self.assert_queue_outputs(StyleQueue(host=MockHost()), tool=tool, work_item=patch, expected_logs=expected_logs)
</ins></span></pre>
</div>
</div>
</body>
</html>