Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py - Issue 15416008: Remove a bunch of dead code from webkitpy

Unified Diff: Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

Issue 15416008: Remove a bunch of dead code from webkitpy (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 7 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Index: Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

diff --git a/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py b/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

deleted file mode 100644

index ba9254b02b32c7a11cdb419099376f87956aedd8..0000000000000000000000000000000000000000

--- a/Tools/Scripts/webkitpy/tool/bot/commitqueuetask_unittest.py

+++ /dev/null

@@ -1,582 +0,0 @@

-# Redistribution and use in source and binary forms, with or without

-# modification, are permitted provided that the following conditions are

-# met:

-# * Redistributions of source code must retain the above copyright

-# notice, this list of conditions and the following disclaimer.

-# * Redistributions in binary form must reproduce the above

-# copyright notice, this list of conditions and the following disclaimer

-# in the documentation and/or other materials provided with the

-# distribution.

-# * Neither the name of Google Inc. nor the names of its

-# contributors may be used to endorse or promote products derived from

-# this software without specific prior written permission.

-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-from datetime import datetime

-import logging

-import unittest2 as unittest

-from webkitpy.common.net import bugzilla

-from webkitpy.common.net.layouttestresults import LayoutTestResults

-from webkitpy.common.system.executive import ScriptError

-from webkitpy.common.system.outputcapture import OutputCapture

-from webkitpy.layout_tests.models import test_results

-from webkitpy.layout_tests.models import test_failures

-from webkitpy.thirdparty.mock import Mock

-from webkitpy.tool.bot.commitqueuetask import *

-from webkitpy.tool.bot.expectedfailures import ExpectedFailures

-from webkitpy.tool.mocktool import MockTool

-_log = logging.getLogger(__name__)

-class MockCommitQueue(CommitQueueTaskDelegate):

- def __init__(self, error_plan):

- self._error_plan = error_plan

- self._failure_status_id = 0

- def run_command(self, command):

- _log.info("run_webkit_patch: %s" % command)

- if self._error_plan:

- error = self._error_plan.pop(0)

- if error:

- raise error

- def command_passed(self, success_message, patch):

- _log.info("command_passed: success_message='%s' patch='%s'" % (

- success_message, patch.id()))

- def command_failed(self, failure_message, script_error, patch):

- _log.info("command_failed: failure_message='%s' script_error='%s' patch='%s'" % (

- failure_message, script_error, patch.id()))

- self._failure_status_id += 1

- return self._failure_status_id

- def refetch_patch(self, patch):

- return patch

- def expected_failures(self):

- return ExpectedFailures()

- def test_results(self):

- return None

- def report_flaky_tests(self, patch, flaky_results, results_archive):

- flaky_tests = [result.filename for result in flaky_results]

- _log.info("report_flaky_tests: patch='%s' flaky_tests='%s' archive='%s'" % (patch.id(), flaky_tests, results_archive.filename))

- def archive_last_test_results(self, patch):

- _log.info("archive_last_test_results: patch='%s'" % patch.id())

- archive = Mock()

- archive.filename = "mock-archive-%s.zip" % patch.id()

- return archive

- def build_style(self):

- return "both"

- def did_pass_testing_ews(self, patch):

- return False

-class FailingTestCommitQueue(MockCommitQueue):

- def __init__(self, error_plan, test_failure_plan):

- MockCommitQueue.__init__(self, error_plan)

- self._test_run_counter = -1 # Special value to indicate tests have never been run.

- self._test_failure_plan = test_failure_plan

- def run_command(self, command):

- if command[0] == "build-and-test":

- self._test_run_counter += 1

- MockCommitQueue.run_command(self, command)

- def _mock_test_result(self, testname):

- return test_results.TestResult(testname, [test_failures.FailureTextMismatch()])

- def test_results(self):

- # Doesn't make sense to ask for the test_results until the tests have run at least once.

- assert(self._test_run_counter >= 0)

- failures_for_run = self._test_failure_plan[self._test_run_counter]

- results = LayoutTestResults(map(self._mock_test_result, failures_for_run))

- # This makes the results trustable by ExpectedFailures.

- results.set_failure_limit_count(10)

- return results

-# We use GoldenScriptError to make sure that the code under test throws the

-# correct (i.e., golden) exception.

-class GoldenScriptError(ScriptError):

- pass

-class CommitQueueTaskTest(unittest.TestCase):

- def _run_through_task(self, commit_queue, expected_logs, expected_exception=None, expect_retry=False):

- tool = MockTool(log_executive=True)

- patch = tool.bugs.fetch_attachment(10000)

- task = CommitQueueTask(commit_queue, patch)

- success = OutputCapture().assert_outputs(self, task.run, expected_logs=expected_logs, expected_exception=expected_exception)

- if not expected_exception:

- self.assertEqual(success, not expect_retry)

- return task

- def test_success_case(self):

- commit_queue = MockCommitQueue([])

- expected_logs = """run_webkit_patch: ['clean']

-command_passed: success_message='Cleaned working directory' patch='10000'

-run_webkit_patch: ['update']

-command_passed: success_message='Updated working directory' patch='10000'

-run_webkit_patch: ['apply-attachment', '--no-update', '--non-interactive', 10000]

-command_passed: success_message='Applied patch' patch='10000'

-run_webkit_patch: ['validate-changelog', '--non-interactive', 10000]

-command_passed: success_message='ChangeLog validated' patch='10000'

-run_webkit_patch: ['build', '--no-clean', '--no-update', '--build-style=both']

-command_passed: success_message='Built patch' patch='10000'

-run_webkit_patch: ['build-and-test', '--no-clean', '--no-update', '--test', '--non-interactive']

-command_passed: success_message='Passed tests' patch='10000'

-run_webkit_patch: ['land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 10000]

-command_passed: success_message='Landed patch' patch='10000'

-"""

- self._run_through_task(commit_queue, expected_logs)

- def test_fast_success_case(self):

- commit_queue = MockCommitQueue([])

- commit_queue.did_pass_testing_ews = lambda patch: True