<!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>[175735] 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/175735">175735</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-06 18:27:49 -0800 (Thu, 06 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove duplicate code from PatchAnalysisTask._test_patch and fix bug
regarding incorrect call to PatchAnalysisTask.report_failure
https://bugs.webkit.org/show_bug.cgi?id=138229
Patch by Jake Nielsen <jacob_nielsen@apple.com> on 2014-11-06
Reviewed by Daniel Bates.
* Scripts/webkitpy/common/net/layouttestresults.py:
Makes sure test_results returns a list.
(LayoutTestResults.test_results):
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
Makes unit tests also check to make sure
task.results_from_patch_test_run() and
task.results_from_test_run_without_patch return instances of
LayoutTestResults.
(CommitQueueTaskTest._run_and_expect_patch_analysis_result):
* Scripts/webkitpy/tool/bot/patchanalysistask.py:
Condenses duplicate code into _should_defer_patch_or_throw, and
removes the now-unused _clean_tree_results member.
(PatchAnalysisTask.__init__):
(PatchAnalysisTask._continue_testing_patch_that_exceeded_failure_limit_on_first_or_second_try):
(PatchAnalysisTask._should_defer_patch_or_throw):
(PatchAnalysisTask._test_patch):
(PatchAnalysisTask.results_from_patch_test_run):
(PatchAnalysisTask.results_from_test_run_without_patch): Deleted.
* Scripts/webkitpy/tool/commands/earlywarningsystem.py:
Removes needless call to results_from_test_run_without_patch
(AbstractEarlyWarningSystem._failing_tests_message):
* Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
Changes order of test failure messages to be in the order that they
appear.
(AbstractEarlyWarningSystemTest.test_failing_tests_message):
* Scripts/webkitpy/tool/commands/queues.py:
Removes needless call to results_from_test_run_without_patch.
(CommitQueue._failing_tests_message):
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(MockCommitQueueTask.results_from_test_run_without_patch): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonnetlayouttestresultspy">trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolbotcommitqueuetask_unittestpy">trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.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="#trunkToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy">trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.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 (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/ChangeLog 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2014-11-06 Jake Nielsen <jacob_nielsen@apple.com>
+
+ Remove duplicate code from PatchAnalysisTask._test_patch and fix bug
+ regarding incorrect call to PatchAnalysisTask.report_failure
+ https://bugs.webkit.org/show_bug.cgi?id=138229
+
+ Reviewed by Daniel Bates.
+
+ * Scripts/webkitpy/common/net/layouttestresults.py:
+ Makes sure test_results returns a list.
+ (LayoutTestResults.test_results):
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ Makes unit tests also check to make sure
+ task.results_from_patch_test_run() and
+ task.results_from_test_run_without_patch return instances of
+ LayoutTestResults.
+ (CommitQueueTaskTest._run_and_expect_patch_analysis_result):
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ Condenses duplicate code into _should_defer_patch_or_throw, and
+ removes the now-unused _clean_tree_results member.
+ (PatchAnalysisTask.__init__):
+ (PatchAnalysisTask._continue_testing_patch_that_exceeded_failure_limit_on_first_or_second_try):
+ (PatchAnalysisTask._should_defer_patch_or_throw):
+ (PatchAnalysisTask._test_patch):
+ (PatchAnalysisTask.results_from_patch_test_run):
+ (PatchAnalysisTask.results_from_test_run_without_patch): Deleted.
+ * Scripts/webkitpy/tool/commands/earlywarningsystem.py:
+ Removes needless call to results_from_test_run_without_patch
+ (AbstractEarlyWarningSystem._failing_tests_message):
+ * Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py:
+ Changes order of test failure messages to be in the order that they
+ appear.
+ (AbstractEarlyWarningSystemTest.test_failing_tests_message):
+ * Scripts/webkitpy/tool/commands/queues.py:
+ Removes needless call to results_from_test_run_without_patch.
+ (CommitQueue._failing_tests_message):
+ * Scripts/webkitpy/tool/commands/queues_unittest.py:
+ (MockCommitQueueTask.results_from_test_run_without_patch): Deleted.
+
</ins><span class="cx"> 2014-11-06 Ryuan Choi <ryuan.choi@navercorp.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Reorder my e-mail addresses in contributors.json
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonnetlayouttestresultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/common/net/layouttestresults.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> return self._did_exceed_test_failure_limit
</span><span class="cx">
</span><span class="cx"> def test_results(self):
</span><del>- return self._test_results
</del><ins>+ return [result for result in self._test_results]
</ins><span class="cx">
</span><span class="cx"> def results_matching_failure_types(self, failure_types):
</span><span class="cx"> return [result for result in self._test_results if result.has_failure_matching_types(*failure_types)]
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotcommitqueuetask_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -181,6 +181,7 @@
</span><span class="cx"> # The failure status only means anything if we actually failed.
</span><span class="cx"> if expected_analysis_result == PatchAnalysisResult.FAIL:
</span><span class="cx"> self.assertEqual(task.failure_status_id, expected_failure_status_id)
</span><ins>+ self.assertIsInstance(task.results_from_patch_test_run(patch), LayoutTestResults)
</ins><span class="cx">
</span><span class="cx"> def _run_through_task(self, commit_queue, expected_logs, expected_exception=None, expect_retry=False):
</span><span class="cx"> self.maxDiff = None
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolbotpatchanalysistaskpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -82,7 +82,6 @@
</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><del>- self._clean_tree_results = None
</del><span class="cx">
</span><span class="cx"> def _run_command(self, command, success_message, failure_message):
</span><span class="cx"> try:
</span><span class="lines">@@ -185,17 +184,34 @@
</span><span class="cx">
</span><span class="cx"> def _continue_testing_patch_that_exceeded_failure_limit_on_first_or_second_try(self, results, results_archive, script_error):
</span><span class="cx"> self._build_and_test_without_patch()
</span><del>- self._clean_tree_results = self._delegate.test_results()
</del><span class="cx">
</span><span class="cx"> # If we've made it here, then many (500) tests are failing with the patch applied, but
</span><span class="cx"> # if the clean tree is also failing many tests, even if it's not quite as many (495),
</span><span class="cx"> # then we can't be certain that the discrepancy isn't due to flakiness, and hence we must
</span><span class="cx"> # defer judgement.
</span><del>- if (len(results.failing_tests()) - len(self._clean_tree_results.failing_tests())) <= 5:
</del><ins>+ if (len(results.failing_tests()) - len(self._delegate.test_results().failing_tests())) <= 5:
</ins><span class="cx"> return False
</span><span class="cx">
</span><span class="cx"> return self.report_failure(results_archive, results, script_error)
</span><span class="cx">
</span><ins>+ def _should_defer_patch_or_throw(self, failures_with_patch, results_archive_for_failures_with_patch, script_error, failure_id):
+ self._build_and_test_without_patch()
+ clean_tree_results = self._delegate.test_results()
+
+ if clean_tree_results.did_exceed_test_failure_limit():
+ # We cannot know whether the failures we saw in the test runs with the patch are expected.
+ return True
+
+ failures_introduced_by_patch = frozenset(failures_with_patch) - frozenset(clean_tree_results.failing_test_results())
+ if failures_introduced_by_patch:
+ self.failure_status_id = failure_id
+ # report_failure will either throw or return false.
+ return not self.report_failure(results_archive_for_failures_with_patch, LayoutTestResults(failures_introduced_by_patch, did_exceed_test_failure_limit=False), script_error)
+
+ # In this case, we know that all of the failures that we saw with the patch were
+ # also present without the patch, so we don't need to defer.
+ return False
+
</ins><span class="cx"> def _test_patch(self):
</span><span class="cx"> if self._test():
</span><span class="cx"> return True
</span><span class="lines">@@ -236,33 +252,16 @@
</span><span class="cx">
</span><span class="cx"> tests_that_consistently_failed = first_failing_results_set.intersection(second_failing_results_set)
</span><span class="cx"> if tests_that_consistently_failed:
</span><del>- self._build_and_test_without_patch()
- self._clean_tree_results = self._delegate.test_results()
- tests_that_failed_on_tree = self._clean_tree_results.failing_test_results()
</del><ins>+ if self._should_defer_patch_or_throw(tests_that_consistently_failed, first_results_archive, first_script_error, first_failure_status_id):
+ return False # Defer patch
</ins><span class="cx">
</span><del>- new_failures_introduced_by_patch = tests_that_consistently_failed.difference(set(tests_that_failed_on_tree))
- if new_failures_introduced_by_patch:
- self.failure_status_id = first_failure_status_id
- return self.report_failure(first_results_archive, new_failures_introduced_by_patch, first_script_error)
-
- # At this point we know that there is flakyness with the patch applied, but no consistent failures
</del><ins>+ # At this point we know that at least one test flaked, but no consistent failures
</ins><span class="cx"> # were introduced. This is a bit of a grey-zone.
</span><del>- return False
</del><ins>+ return False # Defer patch
</ins><span class="cx">
</span><del>- if self._build_and_test_without_patch():
- # The error from the previous ._test() run is real, report it.
- self.failure_status_id = first_failure_status_id
- return self.report_failure(first_results_archive, first_results, first_script_error)
</del><ins>+ if self._should_defer_patch_or_throw(first_results.failing_test_results(), first_results_archive, first_script_error, first_failure_status_id):
+ return False # Defer patch
</ins><span class="cx">
</span><del>- self._clean_tree_results = self._delegate.test_results()
-
- if self._clean_tree_results.did_exceed_test_failure_limit():
- return False
-
- if set(first_results.failing_tests()) - set(self._clean_tree_results.failing_tests()):
- self.failure_status_id = first_failure_status_id
- return self.report_failure(first_results_archive, first_results, first_script_error)
-
</del><span class="cx"> # At this point, we know that the first and second runs had the exact same failures,
</span><span class="cx"> # and that those failures are all present on the clean tree, so we can say with certainty
</span><span class="cx"> # that the patch is good.
</span><span class="lines">@@ -276,10 +275,6 @@
</span><span class="cx"> assert(self._patch.id() == patch.id()) # PatchAnalysisTask is not currently re-useable.
</span><span class="cx"> return self._results_from_patch_test_run
</span><span class="cx">
</span><del>- def results_from_test_run_without_patch(self, patch):
- assert(self._patch.id() == patch.id()) # PatchAnalysisTask is not currently re-useable.
- return self._clean_tree_results
-
</del><span class="cx"> def report_failure(self, results_archive=None, results=None, script_error=None):
</span><span class="cx"> if not self.validate():
</span><span class="cx"> return False
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystempy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -58,16 +58,13 @@
</span><span class="cx">
</span><span class="cx"> def _failing_tests_message(self, task, patch):
</span><span class="cx"> results = task.results_from_patch_test_run(patch)
</span><del>- clean_results = task.results_from_test_run_without_patch(patch)
</del><span class="cx">
</span><del>- unexpected_failures = None
- if results and clean_results:
- unexpected_failures = list(set(results.failing_tests()) - set(clean_results.failing_tests()))
- if not unexpected_failures:
</del><ins>+ if not results:
</ins><span class="cx"> return None
</span><del>- if results and results.did_exceed_test_failure_limit():
</del><ins>+
+ if results.did_exceed_test_failure_limit():
</ins><span class="cx"> return "Number of test failures exceeded the failure limit."
</span><del>- return "New failing tests:\n%s" % "\n".join(unexpected_failures)
</del><ins>+ return "New failing tests:\n%s" % "\n".join(results.failing_tests())
</ins><span class="cx">
</span><span class="cx"> def _post_reject_message_on_bug(self, tool, patch, status_id, extra_message_text=None):
</span><span class="cx"> if not extra_message_text:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsearlywarningsystem_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/earlywarningsystem_unittest.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -51,9 +51,8 @@
</span><span class="cx"> task.results_from_patch_test_run = lambda a: LayoutTestResults([test_results.TestResult("foo.html", failures=[test_failures.FailureTextMismatch()]),
</span><span class="cx"> test_results.TestResult("bar.html", failures=[test_failures.FailureTextMismatch()])],
</span><span class="cx"> did_exceed_test_failure_limit=False)
</span><del>- task.results_from_test_run_without_patch = lambda a: LayoutTestResults([], did_exceed_test_failure_limit=False)
</del><span class="cx"> patch = ews._tool.bugs.fetch_attachment(10000)
</span><del>- self.assertMultiLineEqual(ews._failing_tests_message(task, patch), "New failing tests:\nbar.html\nfoo.html")
</del><ins>+ self.assertMultiLineEqual(ews._failing_tests_message(task, patch), "New failing tests:\nfoo.html\nbar.html")
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> class EarlyWarningSystemTest(QueuesTest):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueuespy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -338,17 +338,13 @@
</span><span class="cx">
</span><span class="cx"> def _failing_tests_message(self, task, patch):
</span><span class="cx"> results = task.results_from_patch_test_run(patch)
</span><del>- clean_results = task.results_from_test_run_without_patch(patch)
</del><span class="cx">
</span><del>- unexpected_failures = None
- if results and clean_results:
- unexpected_failures = list(set(results.failing_tests()) - set(clean_results.failing_tests()))
- # FIXME: Can this ever happen?
- if not unexpected_failures:
</del><ins>+ if not results:
</ins><span class="cx"> return None
</span><del>- if results and results.did_exceed_test_failure_limit():
</del><ins>+
+ if results.did_exceed_test_failure_limit():
</ins><span class="cx"> return "Number of test failures exceeded the failure limit."
</span><del>- return "New failing tests:\n%s" % "\n".join(unexpected_failures)
</del><ins>+ return "New failing tests:\n%s" % "\n".join(results.failing_tests())
</ins><span class="cx">
</span><span class="cx"> def _error_message_for_bug(self, task, patch, script_error):
</span><span class="cx"> message = self._failing_tests_message(task, patch)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolcommandsqueues_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py (175734 => 175735)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2014-11-07 02:26:23 UTC (rev 175734)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py 2014-11-07 02:27:49 UTC (rev 175735)
</span><span class="lines">@@ -308,9 +308,6 @@
</span><span class="cx"> def results_from_patch_test_run(self, patch):
</span><span class="cx"> return LayoutTestResults([test_results.TestResult("mock_test_name.html", failures=[test_failures.FailureTextMismatch()])], did_exceed_test_failure_limit=False)
</span><span class="cx">
</span><del>- def results_from_test_run_without_patch(self, patch):
- return LayoutTestResults([], did_exceed_test_failure_limit=False)
-
</del><span class="cx"> queue = CommitQueue(MockCommitQueueTask)
</span><span class="cx">
</span><span class="cx"> def mock_run_webkit_patch(command):
</span></span></pre>
</div>
</div>
</body>
</html>