Changeset 147826 in webkit


Ignore:
Timestamp:
Apr 5, 2013 7:05:18 PM (11 years ago)
Author:
rniwa@webkit.org
Message:

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):

Location:
trunk/Tools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r147818 r147826  
     12013-04-05  Ryosuke Niwa  <rniwa@webkit.org>
     2
     3        Re-enable testing on the commit queue
     4        https://bugs.webkit.org/show_bug.cgi?id=114078
     5
     6        Reviewed by Darin Adler.
     7
     8        Re-enabled the feature and the associated tests.
     9
     10        * Scripts/webkitpy/tool/bot/commitqueuetask.py:
     11        (CommitQueueTask.run):
     12        * Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py:
     13        (CommitQueueTaskTest._run_through_task):
     14        * Scripts/webkitpy/tool/commands/queues_unittest.py:
     15        (CommitQueueTest._mock_test_result):
     16
    1172013-04-05  Oliver Hunt  <oliver@apple.com>
    218
  • trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask.py

    r147695 r147826  
    8383                    return False
    8484                return self.report_failure()
    85             # FIXME: We temporarily disable tests on commit queue as we don't have enough machine resources.
    86             # if not self._did_pass_tests_recently():
    87             #    return False
     85            if not self._did_pass_tests_recently():
     86                return False
    8887        # Make sure the patch is still valid before landing (e.g., make sure
    8988        # no one has set commit-queue- since we started working on the patch.)
  • trunk/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

    r147709 r147826  
    133133        return task
    134134
    135     @unittest.skip("Commit queue testing temporarily disabled.")
    136135    def test_success_case(self):
    137136        commit_queue = MockCommitQueue([])
     
    272271        self._run_through_task(commit_queue, expected_logs, expect_retry=True)
    273272
    274     @unittest.skip("Commit queue testing temporarily disabled.")
    275273    def test_flaky_test_failure(self):
    276274        commit_queue = MockCommitQueue([
     
    306304        self._run_through_task(commit_queue, expected_logs)
    307305
    308     @unittest.skip("Commit queue testing temporarily disabled.")
    309306    def test_failed_archive(self):
    310307        commit_queue = MockCommitQueue([
     
    339336        self._run_through_task(commit_queue, expected_logs)
    340337
    341     @unittest.skip("Commit queue testing temporarily disabled.")
    342338    def test_double_flaky_test_failure(self):
    343339        commit_queue = FailingTestCommitQueue([
     
    379375        self.assertFalse(success)
    380376
    381     @unittest.skip("Commit queue testing temporarily disabled.")
    382377    def test_test_failure(self):
    383378        commit_queue = MockCommitQueue([
     
    411406        self._run_through_task(commit_queue, expected_logs, GoldenScriptError)
    412407
    413     @unittest.skip("Commit queue testing temporarily disabled.")
    414408    def test_red_test_failure(self):
    415409        commit_queue = FailingTestCommitQueue([
     
    453447        self._run_through_task(commit_queue, expected_logs)
    454448
    455     @unittest.skip("Commit queue testing temporarily disabled.")
    456449    def test_very_red_tree_retry(self):
    457450        lots_of_failing_tests = map(lambda num: "test-%s.html" % num, range(0, 100))
     
    495488        self._run_through_task(commit_queue, expected_logs, expect_retry=True)
    496489
    497     @unittest.skip("Commit queue testing temporarily disabled.")
    498490    def test_red_tree_patch_rejection(self):
    499491        commit_queue = FailingTestCommitQueue([
     
    538530        self.assertEqual(task.failure_status_id, 1)
    539531
    540     @unittest.skip("Commit queue testing temporarily disabled.")
    541532    def test_land_failure(self):
    542533        commit_queue = MockCommitQueue([
  • trunk/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py

    r147709 r147826  
    2929import os
    3030import StringIO
    31 import unittest
    3231
    3332from webkitpy.common.checkout.scm import CheckoutNeedsUpdate
     
    234233        return test_results.TestResult(testname, [test_failures.FailureTextMismatch()])
    235234
    236     @unittest.skip("Commit queue testing temporarily disabled.")
    237235    def test_commit_queue(self):
    238236        tool = MockTool()
     
    318316        self.assert_queue_outputs(queue, expected_logs=expected_logs)
    319317
    320     @unittest.skip("Commit queue testing temporarily disabled.")
    321318    def test_rollout(self):
    322319        tool = MockTool()
     
    390387        self.assertFalse(options.test)
    391388
    392     @unittest.skip("Commit queue testing temporarily disabled.")
    393389    def test_manual_reject_during_processing(self):
    394390        queue = SecondThoughtsCommitQueue(MockTool())
Note: See TracChangeset for help on using the changeset viewer.