Commit be641bf5 authored by rniwa@webkit.org's avatar rniwa@webkit.org

Re-enable testing on the commit queue

https://bugs.webkit.org/show_bug.cgi?id=114078

Reviewed by Darin Adler.

Re-enabled the feature and the associated tests.

* Scripts/webkitpy/tool/bot/commitqueuetask.py:
(CommitQueueTask.run):
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
(CommitQueueTaskTest._run_through_task):
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(CommitQueueTest._mock_test_result):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147826 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bfd5b21c
2013-04-05 Ryosuke Niwa <rniwa@webkit.org>
Re-enable testing on the commit queue
https://bugs.webkit.org/show_bug.cgi?id=114078
Reviewed by Darin Adler.
Re-enabled the feature and the associated tests.
* Scripts/webkitpy/tool/bot/commitqueuetask.py:
(CommitQueueTask.run):
* Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
(CommitQueueTaskTest._run_through_task):
* Scripts/webkitpy/tool/commands/queues_unittest.py:
(CommitQueueTest._mock_test_result):
2013-04-05 Oliver Hunt <oliver@apple.com>
Unify the many and varied stack trace mechanisms, and make the result sane.
......@@ -82,9 +82,8 @@ class CommitQueueTask(PatchAnalysisTask):
if not self._build_without_patch():
return False
return self.report_failure()
# FIXME: We temporarily disable tests on commit queue as we don't have enough machine resources.
# if not self._did_pass_tests_recently():
# return False
if not self._did_pass_tests_recently():
return False
# 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():
......
......@@ -132,7 +132,6 @@ class CommitQueueTaskTest(unittest.TestCase):
self.assertEqual(success, not expect_retry)
return task
@unittest.skip("Commit queue testing temporarily disabled.")
def test_success_case(self):
commit_queue = MockCommitQueue([])
expected_logs = """run_webkit_patch: ['clean']
......@@ -271,7 +270,6 @@ command_failed: failure_message='Unable to build without patch' script_error='MO
"""
self._run_through_task(commit_queue, expected_logs, expect_retry=True)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_flaky_test_failure(self):
commit_queue = MockCommitQueue([
None,
......@@ -305,7 +303,6 @@ command_passed: success_message='Landed patch' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_failed_archive(self):
commit_queue = MockCommitQueue([
None,
......@@ -338,7 +335,6 @@ command_passed: success_message='Landed patch' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_double_flaky_test_failure(self):
commit_queue = FailingTestCommitQueue([
None,
......@@ -378,7 +374,6 @@ command_failed: failure_message='Patch does not pass tests' script_error='MOCK t
success = OutputCapture().assert_outputs(self, task.run, expected_logs=expected_logs)
self.assertFalse(success)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_test_failure(self):
commit_queue = MockCommitQueue([
None,
......@@ -410,7 +405,6 @@ command_passed: success_message='Able to pass tests without patch' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs, GoldenScriptError)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_red_test_failure(self):
commit_queue = FailingTestCommitQueue([
None,
......@@ -452,7 +446,6 @@ command_passed: success_message='Landed patch' patch='10000'
"""
self._run_through_task(commit_queue, expected_logs)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_very_red_tree_retry(self):
lots_of_failing_tests = map(lambda num: "test-%s.html" % num, range(0, 100))
commit_queue = FailingTestCommitQueue([
......@@ -494,7 +487,6 @@ command_failed: failure_message='Unable to pass tests without patch (tree is red
"""
self._run_through_task(commit_queue, expected_logs, expect_retry=True)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_red_tree_patch_rejection(self):
commit_queue = FailingTestCommitQueue([
None,
......@@ -537,7 +529,6 @@ command_failed: failure_message='Unable to pass tests without patch (tree is red
# failure_status_id should be of the test with patch (1), not the test without patch (2).
self.assertEqual(task.failure_status_id, 1)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_land_failure(self):
commit_queue = MockCommitQueue([
None,
......
......@@ -28,7 +28,6 @@
import os
import StringIO
import unittest
from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
from webkitpy.common.checkout.scm.scm_mock import MockSCM
......@@ -233,7 +232,6 @@ class CommitQueueTest(QueuesTest):
def _mock_test_result(self, testname):
return test_results.TestResult(testname, [test_failures.FailureTextMismatch()])
@unittest.skip("Commit queue testing temporarily disabled.")
def test_commit_queue(self):
tool = MockTool()
tool.filesystem.write_text_file('/tmp/layout-test-results/full_results.json', '') # Otherwise the commit-queue will hit a KeyError trying to read the results from the MockFileSystem.
......@@ -317,7 +315,6 @@ MOCK: release_work_item: commit-queue 10000
queue.run_webkit_patch = mock_run_webkit_patch
self.assert_queue_outputs(queue, expected_logs=expected_logs)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_rollout(self):
tool = MockTool()
tool.filesystem.write_text_file('/tmp/layout-test-results/full_results.json', '') # Otherwise the commit-queue will hit a KeyError trying to read the results from the MockFileSystem.
......@@ -389,7 +386,6 @@ MOCK: update_status: commit-queue Tests passed, but commit failed (checkout out
self.assertFalse(options.build)
self.assertFalse(options.test)
@unittest.skip("Commit queue testing temporarily disabled.")
def test_manual_reject_during_processing(self):
queue = SecondThoughtsCommitQueue(MockTool())
queue.begin_work_queue()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment