Title: [132679] trunk/Tools
- Revision
- 132679
- Author
- [email protected]
- Date
- 2012-10-26 11:44:40 -0700 (Fri, 26 Oct 2012)
Log Message
Build bot gives incorrect link to EWS build failure
https://bugs.webkit.org/show_bug.cgi?id=100436
Reviewed by Adam Barth.
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
(MockCommitQueue.__init__):
(MockCommitQueue.command_failed): Return incremental failure_status_id
(CommitQueueTaskTest.test_red_tree_patch_rejection): Check failure_status_id
* Scripts/webkitpy/tool/bot/patchanalysistask.py:
(PatchAnalysisTask._test_patch): Use the failure_status_id of test with patch when test without patch fails and test with patch has unexpected failures.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (132678 => 132679)
--- trunk/Tools/ChangeLog 2012-10-26 18:41:10 UTC (rev 132678)
+++ trunk/Tools/ChangeLog 2012-10-26 18:44:40 UTC (rev 132679)
@@ -1,3 +1,17 @@
+2012-10-26 Xianzhu Wang <[email protected]>
+
+ Build bot gives incorrect link to EWS build failure
+ https://bugs.webkit.org/show_bug.cgi?id=100436
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
+ (MockCommitQueue.__init__):
+ (MockCommitQueue.command_failed): Return incremental failure_status_id
+ (CommitQueueTaskTest.test_red_tree_patch_rejection): Check failure_status_id
+ * Scripts/webkitpy/tool/bot/patchanalysistask.py:
+ (PatchAnalysisTask._test_patch): Use the failure_status_id of test with patch when test without patch fails and test with patch has unexpected failures.
+
2012-10-26 Raphael Kubo da Costa <[email protected]>
webkitpy: Pass the `Listen' Apache directive from webkitpy, not the httpd.conf files.
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py (132678 => 132679)
--- trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2012-10-26 18:41:10 UTC (rev 132678)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py 2012-10-26 18:44:40 UTC (rev 132679)
@@ -45,6 +45,7 @@
class MockCommitQueue(CommitQueueTaskDelegate):
def __init__(self, error_plan):
self._error_plan = error_plan
+ self._failure_status_id = 0
def run_command(self, command):
log("run_webkit_patch: %s" % command)
@@ -60,7 +61,8 @@
def command_failed(self, failure_message, script_error, patch):
log("command_failed: failure_message='%s' script_error='%s' patch='%s'" % (
failure_message, script_error, patch.id()))
- return 3947
+ self._failure_status_id += 1
+ return self._failure_status_id
def refetch_patch(self, patch):
return patch
@@ -522,6 +524,8 @@
"""
task = self._run_through_task(commit_queue, expected_stderr, GoldenScriptError)
self.assertEqual(task.results_from_patch_test_run(task._patch).failing_tests(), ["foo.html", "bar.html"])
+ # failure_status_id should be of the test with patch (1), not the test without patch (2).
+ self.assertEqual(task.failure_status_id, 1)
def test_land_failure(self):
commit_queue = MockCommitQueue([
Modified: trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py (132678 => 132679)
--- trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2012-10-26 18:41:10 UTC (rev 132678)
+++ trunk/Tools/Scripts/webkitpy/tool/bot/patchanalysistask.py 2012-10-26 18:44:40 UTC (rev 132679)
@@ -186,6 +186,7 @@
first_results = self._delegate.test_results()
first_results_archive = self._delegate.archive_last_test_results(self._patch)
first_script_error = self._script_error
+ first_failure_status_id = self.failure_status_id
if self._expected_failures.failures_were_expected(first_results):
return True
@@ -223,6 +224,7 @@
# Now that we have updated information about failing tests with a clean checkout, we can
# tell if our original failures were unexpected and fail the patch if necessary.
if self._expected_failures.unexpected_failures_observed(first_results):
+ self.failure_status_id = first_failure_status_id
return self.report_failure(first_results_archive, first_results, first_script_error)
# We don't know what's going on. The tree is likely very red (beyond our layout-test-results
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
