Changeset 84594 in webkit


Ignore:
Timestamp:
Apr 21, 2011 8:26:50 PM (13 years ago)
Author:
dpranke@chromium.org
Message:

2011-04-21 Dirk Pranke <dpranke@chromium.org>

Reviewed by Tony Chang.

new-run-webkit-tests: obsolete old code, part 3 - rename test_runner to manager
https://bugs.webkit.org/show_bug.cgi?id=58754

test_runner hasn't been a great name for some time, since all of
the test running is actually done in worker and
single_test_runner. Rename to manager to match the terminology
elsewhere.

  • Scripts/webkitpy/layout_tests/layout_package/manager.py: Added.
  • Scripts/webkitpy/layout_tests/layout_package/manager_unittest.py: Added.
  • Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
  • Scripts/webkitpy/layout_tests/layout_package/test_runner.py: Removed.
  • Scripts/webkitpy/layout_tests/layout_package/test_runner_unittest.py: Removed.
  • Scripts/webkitpy/layout_tests/run_webkit_tests.py:
Location:
trunk/Tools
Files:
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r84591 r84594  
     12011-04-21  Dirk Pranke  <dpranke@chromium.org>
     2
     3        Reviewed by Tony Chang.
     4
     5        new-run-webkit-tests: obsolete old code, part 3 - rename test_runner to manager
     6        https://bugs.webkit.org/show_bug.cgi?id=58754
     7
     8        test_runner hasn't been a great name for some time, since all of
     9        the test running is actually done in worker and
     10        single_test_runner. Rename to manager to match the terminology
     11        elsewhere.
     12
     13        * Scripts/webkitpy/layout_tests/layout_package/manager.py: Added.
     14        * Scripts/webkitpy/layout_tests/layout_package/manager_unittest.py: Added.
     15        * Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py:
     16        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py: Removed.
     17        * Scripts/webkitpy/layout_tests/layout_package/test_runner_unittest.py: Removed.
     18        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
     19
    1202011-04-21  Dirk Pranke  <dpranke@chromium.org>
    221
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py

    r84593 r84594  
    3030
    3131"""
    32 The TestRunner class runs a series of tests (TestType interface) against a set
    33 of test files.  If a test file fails a TestType, it returns a list TestFailure
    34 objects to the TestRunner.  The TestRunner then aggregates the TestFailures to
     32The Manager runs a series of tests (TestType interface) against a set
     33of test files.  If a test file fails a TestType, it returns a list of TestFailure
     34objects to the Manager. The Manager then aggregates the TestFailures to
    3535create a final report.
    3636"""
     
    198198
    199199
    200 class TestRunner:
     200class Manager:
    201201    """A class for managing running a series of tests on a series of layout
    202202    test files."""
     
    12301230
    12311231    def name(self):
    1232         return 'TestRunner'
     1232        return 'Manager'
    12331233
    12341234    def is_done(self):
     
    13041304
    13051305class _WorkerState(object):
    1306     """A class for the TestRunner/manager to use to track the current state
    1307     of the workers."""
     1306    """A class for the manager to use to track the current state of the workers."""
    13081307    def __init__(self, number, worker_connection):
    13091308        self.worker_connection = worker_connection
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_unittest.py

    r84593 r84594  
    2929# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
    3030
    31 """Unit tests for TestRunner()."""
     31"""Unit tests for manager.Manager()."""
    3232
    3333import unittest
     
    3636from webkitpy.thirdparty.mock import Mock
    3737
    38 import test_runner
     38from webkitpy.layout_tests.layout_package import manager
    3939
    4040
    41 class TestRunnerWrapper(test_runner.TestRunner):
     41class ManagerWrapper(manager.Manager):
    4242    def _get_test_input_for_file(self, test_file):
    4343        return test_file
    4444
    4545
    46 class TestRunnerTest(unittest.TestCase):
     46class ManagerTest(unittest.TestCase):
    4747    def test_shard_tests(self):
    4848        # Test that _shard_tests in test_runner.TestRunner really
     
    5050        port = Mock()
    5151        port._filesystem = filesystem_mock.MockFileSystem()
    52         runner = TestRunnerWrapper(port=port, options=Mock(),
    53             printer=Mock())
     52        manager = ManagerWrapper(port=port, options=Mock(), printer=Mock())
    5453
    5554        test_list = [
     
    7372
    7473        # FIXME: Ideally the HTTP tests don't have to all be in one shard.
    75         single_thread_results = runner._shard_tests(test_list, False)
    76         multi_thread_results = runner._shard_tests(test_list, True)
     74        single_thread_results = manager._shard_tests(test_list, False)
     75        multi_thread_results = manager._shard_tests(test_list, True)
    7776
    7877        self.assertEqual("tests_to_http_lock", single_thread_results[0][0])
  • trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py

    r79841 r84594  
    4343from webkitpy.layout_tests.layout_package import test_failures
    4444from webkitpy.layout_tests.layout_package import test_results
    45 from webkitpy.layout_tests.layout_package import test_runner
     45from webkitpy.layout_tests.layout_package import manager
    4646
    4747
     
    514514                retry.add(self.get_result('failures/expected/timeout.html'), True)
    515515                retry.add(self.get_result('failures/expected/crash.html'), True)
    516             unexpected_results = test_runner.summarize_results(self._port, exp, rs, retry, test_timings={}, only_unexpected=True)
     516            unexpected_results = manager.summarize_results(self._port, exp, rs, retry, test_timings={}, only_unexpected=True)
    517517            return unexpected_results
    518518
  • trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

    r84591 r84594  
    3838import sys
    3939
    40 from layout_package import json_results_generator
    41 from layout_package import printing
    42 from layout_package import test_runner
     40from webkitpy.layout_tests import layout_package
     41from webkitpy.layout_tests.layout_package import json_results_generator
     42from webkitpy.layout_tests.layout_package import printing
     43from webkitpy.layout_tests.layout_package import manager
    4344
    4445from webkitpy.common.system import user
     
    8990    num_unexpected_results = -1
    9091    try:
    91         runner = test_runner.TestRunner(port, options, printer)
    92         runner._print_config()
     92        manager = layout_package.manager.Manager(port, options, printer)
     93        manager._print_config()
    9394
    9495        printer.print_update("Collecting tests ...")
    9596        try:
    96             runner.collect_tests(args, last_unexpected_results)
     97            manager.collect_tests(args, last_unexpected_results)
    9798        except IOError, e:
    9899            if e.errno == errno.ENOENT:
     
    101102
    102103        if options.lint_test_files:
    103             return runner.lint()
     104            return manager.lint()
    104105
    105106        printer.print_update("Parsing expectations ...")
    106         runner.parse_expectations()
     107        manager.parse_expectations()
    107108
    108109        printer.print_update("Checking build ...")
    109         if not port.check_build(runner.needs_http()):
     110        if not port.check_build(manager.needs_http()):
    110111            _log.error("Build check failed")
    111112            return -1
    112113
    113         result_summary = runner.set_up_run()
     114        result_summary = manager.set_up_run()
    114115        if result_summary:
    115             num_unexpected_results = runner.run(result_summary)
    116             runner.clean_up_run()
     116            num_unexpected_results = manager.run(result_summary)
     117            manager.clean_up_run()
    117118            _log.debug("Testing completed, Exit status: %d" %
    118119                       num_unexpected_results)
     
    150151    if not options.time_out_ms:
    151152        if options.configuration == "Debug":
    152             options.time_out_ms = str(2 * test_runner.TestRunner.DEFAULT_TEST_TIMEOUT_MS)
     153            options.time_out_ms = str(2 * manager.Manager.DEFAULT_TEST_TIMEOUT_MS)
    153154        else:
    154             options.time_out_ms = str(test_runner.TestRunner.DEFAULT_TEST_TIMEOUT_MS)
     155            options.time_out_ms = str(manager.Manager.DEFAULT_TEST_TIMEOUT_MS)
    155156
    156157    options.slow_time_out_ms = str(5 * int(options.time_out_ms))
Note: See TracChangeset for help on using the changeset viewer.