<!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>[204382] 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/204382">204382</a></dd>
<dt>Author</dt> <dd>aakash_jain@apple.com</dd>
<dt>Date</dt> <dd>2016-08-11 12:45:13 -0700 (Thu, 11 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>EWS should check if the patch is still valid before executing every major step
https://bugs.webkit.org/show_bug.cgi?id=160739
rdar://problem/27768813
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/tool/bot/commitqueuetask.py:
(CommitQueueTask.run): validate method is now executed in base class.
* Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
(EarlyWarningSystemTask.run): validate method is now executed in base class.
* Scripts/webkitpy/tool/bot/stylequeuetask.py:
(StyleQueueTask.validate): Raise an PatchIsNotValid exception instead of returning False.
* Scripts/webkitpy/tool/bot/patchanalysistask.py:
(PatchAnalysisTask._run_command): validate the patch before executing any command. This is to ensure
that we do not waste time on any patch which has become invalid (e.g.: obsolete, r-).
* Scripts/webkitpy/tool/commands/perfalizer.py:
(PerfalizerTask.validate): Added.
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(test_manual_reject_during_processing): Updated test case.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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="#trunkToolsScriptswebkitpytoolbotstylequeuetaskpy">trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolcommandsperfalizerpy">trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.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 (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/ChangeLog 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-08-11 Aakash Jain <aakash_jain@apple.com>
+
+ EWS should check if the patch is still valid before executing every major step
+ https://bugs.webkit.org/show_bug.cgi?id=160739
+ rdar://problem/27768813
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask.py:
+ (CommitQueueTask.run): validate method is now executed in base class.
+ * Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
+ (EarlyWarningSystemTask.run): validate method is now executed in base class.
+ * Scripts/webkitpy/tool/bot/stylequeuetask.py:
+ (StyleQueueTask.validate): Raise an PatchIsNotValid exception instead of returning False.
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ (PatchAnalysisTask._run_command): validate the patch before executing any command. This is to ensure
+ that we do not waste time on any patch which has become invalid (e.g.: obsolete, r-).
+ * Scripts/webkitpy/tool/commands/perfalizer.py:
+ (PerfalizerTask.validate): Added.
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (test_manual_reject_during_processing): Updated test case.
+
</ins><span class="cx"> 2016-08-11 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Add URLParser stub
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotcommitqueuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -72,8 +72,6 @@
</span><span class="cx"> return self._test_patch()
</span><span class="cx">
</span><span class="cx"> def run(self):
</span><del>- if not self.validate():
- raise PatchIsNotValid(self._patch, self.error)
</del><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">@@ -89,10 +87,6 @@
</span><span class="cx"> return self.report_failure()
</span><span class="cx"> if not self._did_pass_tests_recently():
</span><span class="cx"> return False
</span><del>- # Make sure the patch is still valid before landing (e.g., make sure
- # no one has set commit-queue- since we started working on the patch.)
- if not self.validate():
- raise PatchIsNotValid(self._patch, self.error)
</del><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 (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> return True
</span><span class="cx">
</span><span class="cx"> def run(self):
</span><del>- if not self.validate():
- raise PatchIsNotValid(self._patch, self.error)
</del><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 (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -83,8 +83,11 @@
</span><span class="cx"> self._script_error = None
</span><span class="cx"> self._results_archive_from_patch_test_run = None
</span><span class="cx"> self._results_from_patch_test_run = None
</span><ins>+ self.error = None
</ins><span class="cx">
</span><span class="cx"> def _run_command(self, command, success_message, failure_message):
</span><ins>+ if not self.validate():
+ raise PatchIsNotValid(self._patch, self.error)
</ins><span class="cx"> try:
</span><span class="cx"> self._delegate.run_command(command)
</span><span class="cx"> self._delegate.command_passed(success_message, patch=self._patch)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotstylequeuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/stylequeuetask.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -66,8 +66,6 @@
</span><span class="cx"> "Unabled to apply watchlist")
</span><span class="cx">
</span><span class="cx"> def run(self):
</span><del>- if not self.validate():
- raise PatchIsNotValid(self._patch, self.error)
</del><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="trunkToolsScriptswebkitpytoolcommandsperfalizerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/perfalizer.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -62,6 +62,9 @@
</span><span class="cx"> except:
</span><span class="cx"> return False
</span><span class="cx">
</span><ins>+ def validate(self):
+ return True
+
</ins><span class="cx"> def run(self):
</span><span class="cx"> if not self._patch.committer() and not self._patch.attacher().can_commit:
</span><span class="cx"> self._logger('The patch %d is not authorized by a commmitter' % self._patch.id())
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (204381 => 204382)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-08-11 19:22:26 UTC (rev 204381)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2016-08-11 19:45:13 UTC (rev 204382)
</span><span class="lines">@@ -411,16 +411,6 @@
</span><span class="cx"> queue._options.port = None
</span><span class="cx"> expected_logs = """Running: webkit-patch --status-host=example.com clean --port=mac
</span><span class="cx"> MOCK: update_status: commit-queue Cleaned working directory
</span><del>-Running: webkit-patch --status-host=example.com update --port=mac
-MOCK: update_status: commit-queue Updated working directory
-Running: webkit-patch --status-host=example.com apply-attachment --no-update --non-interactive 10000 --port=mac
-MOCK: update_status: commit-queue Applied patch
-Running: webkit-patch --status-host=example.com validate-changelog --check-oops --non-interactive 10000 --port=mac
-MOCK: update_status: commit-queue ChangeLog validated
-Running: webkit-patch --status-host=example.com build --no-clean --no-update --build-style=release --port=mac
-MOCK: update_status: commit-queue Built patch
-Running: webkit-patch --status-host=example.com build-and-test --no-clean --no-update --test --non-interactive --build-style=release --port=mac
-MOCK: update_status: commit-queue Passed tests
</del><span class="cx"> MOCK: update_status: commit-queue Error: commit-queue did not process patch. Reason: Patch is obsolete.
</span><span class="cx"> MOCK: release_work_item: commit-queue 10000
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>