<!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>[174408] 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/174408">174408</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-07 15:14:01 -0700 (Tue, 07 Oct 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Commit queue doesn't drop obsolete patches sometimes
https://bugs.webkit.org/show_bug.cgi?id=137460

Patch by Jake Nielsen &lt;jacob_nielsen@apple.com&gt; on 2014-10-07
Reviewed by Alexey Proskuryakov.

* Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
Adds another test patch for use in queues_unittest.py.
courtesy of Csaba Osztrogonác &lt;ossy@webkit.org&gt;
(MockBugzilla):
* Scripts/webkitpy/tool/bot/commitqueuetask.py:
Raises a PatchIsNotValid exception in the case of validate() returning
false.
(CommitQueueTask.run):
* Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
Raises a PatchIsNotValid exception in the case of validate() returning
false.
(EarlyWarningSystemTask.run):
* Scripts/webkitpy/tool/bot/patchanalysistask.py:
Defines PatchIsNotValid exception.
(PatchIsNotValid):
(PatchIsNotValid.__init__):
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
Remove call to validate() and instead catches the PatchIsNotValid
exception.
(AbstractEarlyWarningSystem.review_patch):
* Scripts/webkitpy/tool/commands/queues.py:
Adds logic to catch the PatchIsNotValid exception.
(CommitQueue.process_work_item):
* Scripts/webkitpy/tool/commands/queues_unittest.py:
Adds the test_non_valid_patch test to ensure that invalid patches are
handled properly, and don't just result in indefinite spinning.
courtesy of Csaba Osztrogonác &lt;ossy@webkit.org&gt;
(test_non_valid_patch):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetbugzillabugzilla_mockpy">trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.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 (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/ChangeLog        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2014-10-07  Jake Nielsen  &lt;jacob_nielsen@apple.com&gt;
+
+        Commit queue doesn't drop obsolete patches sometimes
+        https://bugs.webkit.org/show_bug.cgi?id=137460
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py:
+        Adds another test patch for use in queues_unittest.py.
+        courtesy of Csaba Osztrogonác &lt;ossy@webkit.org&gt;
+        (MockBugzilla):
+        * Scripts/webkitpy/tool/bot/commitqueuetask.py:
+        Raises a PatchIsNotValid exception in the case of validate() returning
+        false.
+        (CommitQueueTask.run):
+        * Scripts/webkitpy/tool/bot/earlywarningsystemtask.py:
+        Raises a PatchIsNotValid exception in the case of validate() returning
+        false.
+        (EarlyWarningSystemTask.run):
+        * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+        Defines PatchIsNotValid exception. 
+        (PatchIsNotValid):
+        (PatchIsNotValid.__init__):
+        * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+        Remove call to validate() and instead catches the PatchIsNotValid
+        exception.
+        (AbstractEarlyWarningSystem.review_patch):
+        * Scripts/webkitpy/tool/commands/queues.py:
+        Adds logic to catch the PatchIsNotValid exception.
+        (CommitQueue.process_work_item):
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+        Adds the test_non_valid_patch test to ensure that invalid patches are
+        handled properly, and don't just result in indefinite spinning.
+        courtesy of Csaba Osztrogonác &lt;ossy@webkit.org&gt;
+        (test_non_valid_patch):
+
</ins><span class="cx"> 2014-10-07  Daniel Bates  &lt;dabates@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [iOS] Teach run-webkit-tests to honor TestExpectation file for iOS Simulator 64-bit builds
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetbugzillabugzilla_mockpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/common/net/bugzilla/bugzilla_mock.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -141,6 +141,15 @@
</span><span class="cx">     &quot;attacher_email&quot;: &quot;eric@webkit.org&quot;,
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+_patch8 = {  # Resolved bug, without review flag, not marked obsolete (maybe already landed)
+    &quot;id&quot;: 10007,
+    &quot;bug_id&quot;: 50005,
+    &quot;url&quot;: &quot;http://example.com/10002&quot;,
+    &quot;name&quot;: &quot;Patch8&quot;,
+    &quot;is_obsolete&quot;: False,
+    &quot;is_patch&quot;: True,
+    &quot;attacher_email&quot;: &quot;eric@webkit.org&quot;,
+}
</ins><span class="cx"> 
</span><span class="cx"> # This matches one of Bug.unassigned_emails
</span><span class="cx"> _unassigned_email = &quot;webkit-unassigned@lists.webkit.org&quot;
</span><span class="lines">@@ -242,7 +251,7 @@
</span><span class="cx">     &quot;reporter_email&quot;: _commit_queue_email,
</span><span class="cx">     &quot;assigned_to_email&quot;: &quot;foo@foo.com&quot;,
</span><span class="cx">     &quot;cc_emails&quot;: [],
</span><del>-    &quot;attachments&quot;: [],
</del><ins>+    &quot;attachments&quot;: [_patch8],
</ins><span class="cx">     &quot;bug_status&quot;: &quot;RESOLVED&quot;,
</span><span class="cx">     &quot;comments&quot;: [{&quot;comment_date&quot;:  datetime.datetime(2011, 6, 11, 9, 4, 3),
</span><span class="cx">                   &quot;comment_email&quot;: &quot;bar@foo.com&quot;,
</span><span class="lines">@@ -343,7 +352,8 @@
</span><span class="cx">                                                 _patch4,
</span><span class="cx">                                                 _patch5,
</span><span class="cx">                                                 _patch6,
</span><del>-                                                _patch7)
</del><ins>+                                                _patch7,
+                                                _patch8)
</ins><span class="cx"> 
</span><span class="cx">     def __init__(self):
</span><span class="cx">         self.queries = MockBugzillaQueries(self)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotcommitqueuetaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><del>-from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate
</del><ins>+from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate, PatchIsNotValid
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class CommitQueueTaskDelegate(PatchAnalysisTaskDelegate):
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx"> 
</span><span class="cx">     def run(self):
</span><span class="cx">         if not self.validate():
</span><del>-            return False
</del><ins>+            raise PatchIsNotValid(self._patch)
</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 +88,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>-            return False
</del><ins>+            raise PatchIsNotValid(self._patch)
</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 (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/earlywarningsystemtask.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
</span><span class="cx"> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> 
</span><del>-from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate, UnableToApplyPatch
</del><ins>+from webkitpy.tool.bot.patchanalysistask import PatchAnalysisTask, PatchAnalysisTaskDelegate, UnableToApplyPatch, PatchIsNotValid
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> class EarlyWarningSystemTaskDelegate(PatchAnalysisTaskDelegate):
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> 
</span><span class="cx">     def run(self):
</span><span class="cx">         if not self.validate():
</span><del>-            return False
</del><ins>+            raise PatchIsNotValid(self._patch)
</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 (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -36,6 +36,12 @@
</span><span class="cx">         self.patch = patch
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+class PatchIsNotValid(Exception):
+    def __init__(self, patch):
+        Exception.__init__(self)
+        self.patch = patch
+
+
</ins><span class="cx"> class PatchAnalysisTaskDelegate(object):
</span><span class="cx">     def parent_command(self):
</span><span class="cx">         raise NotImplementedError(&quot;subclasses must implement&quot;)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> from webkitpy.tool.bot.earlywarningsystemtask import EarlyWarningSystemTask, EarlyWarningSystemTaskDelegate
</span><span class="cx"> from webkitpy.tool.bot.expectedfailures import ExpectedFailures
</span><span class="cx"> from webkitpy.tool.bot.layouttestresultsreader import LayoutTestResultsReader
</span><del>-from webkitpy.tool.bot.patchanalysistask import UnableToApplyPatch
</del><ins>+from webkitpy.tool.bot.patchanalysistask import UnableToApplyPatch, PatchIsNotValid
</ins><span class="cx"> from webkitpy.tool.bot.queueengine import QueueEngine
</span><span class="cx"> from webkitpy.tool.commands.queues import AbstractReviewQueue
</span><span class="cx"> 
</span><span class="lines">@@ -83,15 +83,14 @@
</span><span class="cx"> 
</span><span class="cx">     def review_patch(self, patch):
</span><span class="cx">         task = EarlyWarningSystemTask(self, patch, self._options.run_tests)
</span><del>-        if not task.validate():
-            self._did_error(patch, &quot;%s did not process patch.&quot; % self.name)
-            return False
</del><span class="cx">         try:
</span><span class="cx">             succeeded = task.run()
</span><span class="cx">             if not succeeded:
</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><ins>+        except PatchIsNotValid:
+            self._did_error(patch, &quot;%s did not process patch.&quot; % self.name)
</ins><span class="cx">         except UnableToApplyPatch, e:
</span><span class="cx">             self._did_error(patch, &quot;%s unable to apply patch.&quot; % self.name)
</span><span class="cx">             return False
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> from webkitpy.tool.bot.feeders import CommitQueueFeeder, EWSFeeder
</span><span class="cx"> from webkitpy.tool.bot.flakytestreporter import FlakyTestReporter
</span><span class="cx"> from webkitpy.tool.bot.layouttestresultsreader import LayoutTestResultsReader
</span><del>-from webkitpy.tool.bot.patchanalysistask import UnableToApplyPatch
</del><ins>+from webkitpy.tool.bot.patchanalysistask import UnableToApplyPatch, PatchIsNotValid
</ins><span class="cx"> from webkitpy.tool.bot.queueengine import QueueEngine, QueueEngineDelegate
</span><span class="cx"> from webkitpy.tool.bot.stylequeuetask import StyleQueueTask, StyleQueueTaskDelegate
</span><span class="cx"> from webkitpy.tool.commands.stepsequence import StepSequenceErrorHandler
</span><span class="lines">@@ -322,6 +322,8 @@
</span><span class="cx">                 return True
</span><span class="cx">             self._unlock_patch(patch)
</span><span class="cx">             return False
</span><ins>+        except PatchIsNotValid:
+            self._did_error(patch, &quot;%s did not process patch.&quot; % self.name)
</ins><span class="cx">         except ScriptError, e:
</span><span class="cx">             validator = CommitterValidator(self._tool)
</span><span class="cx">             validator.reject_patch_from_commit_queue(patch.id(), self._error_message_for_bug(task, patch, e))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (174407 => 174408)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py        2014-10-07 21:35:26 UTC (rev 174407)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py        2014-10-07 22:14:01 UTC (rev 174408)
</span><span class="lines">@@ -370,6 +370,18 @@
</span><span class="cx">         }
</span><span class="cx">         self.assert_queue_outputs(CommitQueue(), tool=tool, work_item=rollout_patch, expected_logs=expected_logs)
</span><span class="cx"> 
</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 = {
+            &quot;begin_work_queue&quot;: self._default_begin_work_queue_logs(&quot;commit-queue&quot;),
+            &quot;process_work_item&quot;: &quot;&quot;&quot;MOCK: update_status: commit-queue Error: commit-queue did not process patch.
+MOCK: release_work_item: commit-queue 10007
+&quot;&quot;&quot;,
+        }
+        self.assert_queue_outputs(CommitQueue(), tool=tool, work_item=patch, expected_logs=expected_logs)
+
+
</ins><span class="cx">     def test_auto_retry(self):
</span><span class="cx">         queue = CommitQueue()
</span><span class="cx">         options = Mock()
</span><span class="lines">@@ -406,7 +418,8 @@
</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 --port=mac
</span><span class="cx"> MOCK: update_status: commit-queue Passed tests
</span><del>-MOCK: release_lock: commit-queue 10000
</del><ins>+MOCK: update_status: commit-queue Error: commit-queue did not process patch.
+MOCK: release_work_item: commit-queue 10000
</ins><span class="cx"> &quot;&quot;&quot;
</span><span class="cx">         self.maxDiff = None
</span><span class="cx">         OutputCapture().assert_outputs(self, queue.process_work_item, [QueuesTest.mock_work_item], expected_logs=expected_logs)
</span></span></pre>
</div>
</div>

</body>
</html>