<!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>[203830] 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/203830">203830</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-07-28 13:12:31 -0700 (Thu, 28 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EWS error message "Error: * did not process patch" should include explanation
https://bugs.webkit.org/show_bug.cgi?id=159903
<rdar://problem/27410788>
Reviewed by Alexey Proskuryakov.
* QueueStatusServer/handlers/statusbubble.py:
(StatusBubble._build_bubble): Display more detailed error message on bubbles when patch
is not processed.
* QueueStatusServer/handlers/processingtimesjson.py:
(ProcessingTimesJSON._resultFromFinalStatus): Updated error message to match with rest
of the code.
* Scripts/webkitpy/tool/bot/commitqueuetask.py:
(CommitQueueTask.validate): Add more information about validation failure.
(CommitQueueTask.run): Pass the error details in the PatchIsNotValid exception.
* Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
(EarlyWarningSystemTask.validate): Add more information about validation failure.
(EarlyWarningSystemTask.run): Pass the error details in the PatchIsNotValid exception.
* Scripts/webkitpy/tool/bot/patchanalysistask.py:
(PatchIsNotValid.__init__): Add the failure_message argument.
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
(AbstractEarlyWarningSystem.review_patch): Re-word the error message and include
failure details.
* Scripts/webkitpy/tool/commands/queues.py:
(CommitQueue.process_work_item): Same.
(StyleQueue.review_patch): Same.
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(test_non_valid_patch): Updated test-cases messages to match the above changes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlersprocessingtimesjsonpy">trunk/Tools/QueueStatusServer/handlers/processingtimesjson.py</a></li>
<li><a href="#trunkToolsQueueStatusServerhandlersstatusbubblepy">trunk/Tools/QueueStatusServer/handlers/statusbubble.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotcommitqueuetaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotearlywarningsystemtaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotpatchanalysistaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsqueuespy">trunk/Tools/Scripts/webkitpy/tool/commands/queues.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 (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/ChangeLog 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-07-28 Aakash Jain <aakash_jain@apple.com>
+
+ EWS error message "Error: * did not process patch" should include explanation
+ https://bugs.webkit.org/show_bug.cgi?id=159903
+ <rdar://problem/27410788>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * QueueStatusServer/handlers/statusbubble.py:
+ (StatusBubble._build_bubble): Display more detailed error message on bubbles when patch
+ is not processed.
+ * QueueStatusServer/handlers/processingtimesjson.py:
+ (ProcessingTimesJSON._resultFromFinalStatus): Updated error message to match with rest
+ of the code.
+ * Scripts/webkitpy/tool/bot/commitqueuetask.py:
+ (CommitQueueTask.validate): Add more information about validation failure.
+ (CommitQueueTask.run): Pass the error details in the PatchIsNotValid exception.
+ * Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
+ (EarlyWarningSystemTask.validate): Add more information about validation failure.
+ (EarlyWarningSystemTask.run): Pass the error details in the PatchIsNotValid exception.
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ (PatchIsNotValid.__init__): Add the failure_message argument.
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ (AbstractEarlyWarningSystem.review_patch): Re-word the error message and include
+ failure details.
+ * Scripts/webkitpy/tool/commands/queues.py:
+ (CommitQueue.process_work_item): Same.
+ (StyleQueue.review_patch): Same.
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (test_non_valid_patch): Updated test-cases messages to match the above changes.
+
</ins><span class="cx"> 2016-07-27 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> LayoutTestRelay should wait for WebKitTestRunnerApp installation to complete
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerhandlersprocessingtimesjsonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/handlers/processingtimesjson.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/processingtimesjson.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/QueueStatusServer/handlers/processingtimesjson.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> return "pass"
</span><span class="cx"> elif status_message == "Fail":
</span><span class="cx"> return "fail"
</span><del>- elif status_message == "Error: " + queue_name + " did not process patch.":
</del><ins>+ elif "did not process patch" in status_message:
</ins><span class="cx"> return "not processed"
</span><span class="cx"> elif status_message == "Error: " + queue_name + " unable to apply patch.":
</span><span class="cx"> return "could not apply"
</span></span></pre></div>
<a id="trunkToolsQueueStatusServerhandlersstatusbubblepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/QueueStatusServer/handlers/statusbubble.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/QueueStatusServer/handlers/statusbubble.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -140,14 +140,24 @@
</span><span class="cx"> bubble["state"] = "fail"
</span><span class="cx"> message_to_display = statuses[1].message if len(statuses) > 1 else statuses[0].message
</span><span class="cx"> bubble["details_message"] = message_to_display + "\n\n" + self._iso_time(statuses[0].date)
</span><del>- elif statuses[0].message == "Error: " + queue.name() + " did not process patch.":
</del><ins>+ elif "did not process patch" in statuses[0].message:
</ins><span class="cx"> bubble["state"] = "none"
</span><span class="cx"> bubble["details_message"] = "The patch is no longer eligible for processing."
</span><ins>+
+ if "Bug is already closed" in statuses[0].message:
+ bubble["details_message"] += " Bug was already closed when EWS attempted to process it."
+ elif "Patch is marked r-" in statuses[0].message:
+ bubble["details_message"] += " Patch was already marked r- when EWS attempted to process it."
+ elif "Patch is obsolete" in statuses[0].message:
+ bubble["details_message"] += " Patch was obsolete when EWS attempted to process it."
+ elif "No patch committer found" in statuses[0].message:
+ bubble["details_message"] += " Patch was not authorized by a commmitter."
+
</ins><span class="cx"> if len(statuses) > 1:
</span><span class="cx"> if len(statuses) == 2:
</span><del>- bubble["details_message"] += " One message was logged while the patch was still eligible:\n\n"
</del><ins>+ bubble["details_message"] += "\nOne message was logged while the patch was still eligible:\n\n"
</ins><span class="cx"> else:
</span><del>- bubble["details_message"] += " Some messages were logged while the patch was still eligible:\n\n"
</del><ins>+ bubble["details_message"] += "\nSome messages were logged while the patch was still eligible:\n\n"
</ins><span class="cx"> bubble["details_message"] += "\n".join([status.message for status in statuses[1:]]) + "\n\n" + self._iso_time(statuses[0].date)
</span><span class="cx"> elif statuses[0].message == "Error: " + queue.name() + " unable to apply patch.":
</span><span class="cx"> bubble["state"] = "fail"
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotcommitqueuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -43,12 +43,16 @@
</span><span class="cx"> # commit-queue is processing.
</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 not self._patch.committer():
</span><ins>+ self.error = "No patch committer found."
</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">@@ -69,7 +73,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 class="lines">@@ -88,7 +92,7 @@
</span><span class="cx"> # Make sure the patch is still valid before landing (e.g., make sure
</span><span class="cx"> # no one has set commit-queue- since we started working on the patch.)
</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"> # FIXME: We should understand why the land failure occurred and retry if possible.
</span><span class="cx"> if not self._land():
</span><span class="cx"> return self.report_failure()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotearlywarningsystemtaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -41,16 +41,19 @@
</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="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="trunkToolsScriptswebkitpytoolbotpatchanalysistaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -37,9 +37,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> class PatchIsNotValid(Exception):
</span><del>- def __init__(self, patch):
</del><ins>+ def __init__(self, patch, failure_message):
</ins><span class="cx"> Exception.__init__(self)
</span><span class="cx"> self.patch = patch
</span><ins>+ self.failure_message = failure_message
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class PatchAnalysisTaskDelegate(object):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -87,8 +87,8 @@
</span><span class="cx"> # Caller unlocks when review_patch returns True, so we only need to unlock on transient failure.
</span><span class="cx"> self._unlock_patch(patch)
</span><span class="cx"> return succeeded
</span><del>- except PatchIsNotValid:
- self._did_error(patch, "%s did not process patch." % self.name)
</del><ins>+ except PatchIsNotValid as error:
+ self._did_error(patch, "%s did not process patch. Reason: %s" % (self.name, error.failure_message))
</ins><span class="cx"> return False
</span><span class="cx"> except UnableToApplyPatch, e:
</span><span class="cx"> self._did_error(patch, "%s unable to apply patch." % self.name)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -345,8 +345,8 @@
</span><span class="cx"> return True
</span><span class="cx"> self._unlock_patch(patch)
</span><span class="cx"> return False
</span><del>- except PatchIsNotValid:
- self._did_error(patch, "%s did not process patch." % self.name)
</del><ins>+ except PatchIsNotValid as error:
+ self._did_error(patch, "%s did not process patch. Reason: %s" % (self.name, error.failure_message))
</ins><span class="cx"> return False
</span><span class="cx"> except ScriptError, e:
</span><span class="cx"> validator = CommitterValidator(self._tool)
</span><span class="lines">@@ -485,8 +485,8 @@
</span><span class="cx"> except UnableToApplyPatch, e:
</span><span class="cx"> self._did_error(patch, "%s unable to apply patch." % self.name)
</span><span class="cx"> return False
</span><del>- except PatchIsNotValid:
- self._did_error(patch, "%s did not process patch." % self.name)
</del><ins>+ except PatchIsNotValid as error:
+ self._did_error(patch, "%s did not process patch. Reason: %s" % (self.name, error.failure_message))
</ins><span class="cx"> return False
</span><span class="cx"> except ScriptError, e:
</span><span class="cx"> output = re.sub(r'Failed to run .+ exit_code: 1', '', e.output)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (203829 => 203830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-07-28 19:53:32 UTC (rev 203829)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-07-28 20:12:31 UTC (rev 203830)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> patch = tool.bugs.fetch_attachment(10007) # _patch8, resolved bug, without review flag, not marked obsolete (maybe already landed)
</span><span class="cx"> expected_logs = {
</span><span class="cx"> "begin_work_queue": self._default_begin_work_queue_logs("commit-queue"),
</span><del>- "process_work_item": """MOCK: update_status: commit-queue Error: commit-queue did not process patch.
</del><ins>+ "process_work_item": """MOCK: update_status: commit-queue Error: commit-queue did not process patch. Reason: Bug is already closed.
</ins><span class="cx"> MOCK: release_work_item: commit-queue 10007
</span><span class="cx"> """,
</span><span class="cx"> }
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> MOCK: update_status: commit-queue Built patch
</span><span class="cx"> Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=release --port=mac
</span><span class="cx"> MOCK: update_status: commit-queue Passed tests
</span><del>-MOCK: update_status: commit-queue Error: commit-queue did not process patch.
</del><ins>+MOCK: update_status: commit-queue Error: commit-queue did not process patch. Reason: Patch is obsolete.
</ins><span class="cx"> MOCK: release_work_item: commit-queue 10000
</span><span class="cx"> """
</span><span class="cx"> self.maxDiff = None
</span></span></pre>
</div>
</div>
</body>
</html>