Changeset 84594 in webkit
- Timestamp:
- Apr 21, 2011 8:26:50 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 3 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r84591 r84594 1 2011-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 1 20 2011-04-21 Dirk Pranke <dpranke@chromium.org> 2 21 -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager.py
r84593 r84594 30 30 31 31 """ 32 The TestRunner classruns a series of tests (TestType interface) against a set33 of test files. If a test file fails a TestType, it returns a list TestFailure34 objects to the TestRunner. The TestRunner then aggregates the TestFailures to32 The Manager 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 of TestFailure 34 objects to the Manager. The Manager then aggregates the TestFailures to 35 35 create a final report. 36 36 """ … … 198 198 199 199 200 class TestRunner:200 class Manager: 201 201 """A class for managing running a series of tests on a series of layout 202 202 test files.""" … … 1230 1230 1231 1231 def name(self): 1232 return ' TestRunner'1232 return 'Manager' 1233 1233 1234 1234 def is_done(self): … … 1304 1304 1305 1305 class _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.""" 1308 1307 def __init__(self, number, worker_connection): 1309 1308 self.worker_connection = worker_connection -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/manager_unittest.py
r84593 r84594 29 29 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 30 30 31 """Unit tests for TestRunner()."""31 """Unit tests for manager.Manager().""" 32 32 33 33 import unittest … … 36 36 from webkitpy.thirdparty.mock import Mock 37 37 38 import test_runner38 from webkitpy.layout_tests.layout_package import manager 39 39 40 40 41 class TestRunnerWrapper(test_runner.TestRunner):41 class ManagerWrapper(manager.Manager): 42 42 def _get_test_input_for_file(self, test_file): 43 43 return test_file 44 44 45 45 46 class TestRunnerTest(unittest.TestCase):46 class ManagerTest(unittest.TestCase): 47 47 def test_shard_tests(self): 48 48 # Test that _shard_tests in test_runner.TestRunner really … … 50 50 port = Mock() 51 51 port._filesystem = filesystem_mock.MockFileSystem() 52 runner = TestRunnerWrapper(port=port, options=Mock(), 53 printer=Mock()) 52 manager = ManagerWrapper(port=port, options=Mock(), printer=Mock()) 54 53 55 54 test_list = [ … … 73 72 74 73 # 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) 77 76 78 77 self.assertEqual("tests_to_http_lock", single_thread_results[0][0]) -
trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing_unittest.py
r79841 r84594 43 43 from webkitpy.layout_tests.layout_package import test_failures 44 44 from webkitpy.layout_tests.layout_package import test_results 45 from webkitpy.layout_tests.layout_package import test_runner45 from webkitpy.layout_tests.layout_package import manager 46 46 47 47 … … 514 514 retry.add(self.get_result('failures/expected/timeout.html'), True) 515 515 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) 517 517 return unexpected_results 518 518 -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r84591 r84594 38 38 import sys 39 39 40 from layout_package import json_results_generator 41 from layout_package import printing 42 from layout_package import test_runner 40 from webkitpy.layout_tests import layout_package 41 from webkitpy.layout_tests.layout_package import json_results_generator 42 from webkitpy.layout_tests.layout_package import printing 43 from webkitpy.layout_tests.layout_package import manager 43 44 44 45 from webkitpy.common.system import user … … 89 90 num_unexpected_results = -1 90 91 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() 93 94 94 95 printer.print_update("Collecting tests ...") 95 96 try: 96 runner.collect_tests(args, last_unexpected_results)97 manager.collect_tests(args, last_unexpected_results) 97 98 except IOError, e: 98 99 if e.errno == errno.ENOENT: … … 101 102 102 103 if options.lint_test_files: 103 return runner.lint()104 return manager.lint() 104 105 105 106 printer.print_update("Parsing expectations ...") 106 runner.parse_expectations()107 manager.parse_expectations() 107 108 108 109 printer.print_update("Checking build ...") 109 if not port.check_build( runner.needs_http()):110 if not port.check_build(manager.needs_http()): 110 111 _log.error("Build check failed") 111 112 return -1 112 113 113 result_summary = runner.set_up_run()114 result_summary = manager.set_up_run() 114 115 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() 117 118 _log.debug("Testing completed, Exit status: %d" % 118 119 num_unexpected_results) … … 150 151 if not options.time_out_ms: 151 152 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) 153 154 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) 155 156 156 157 options.slow_time_out_ms = str(5 * int(options.time_out_ms))
Note: See TracChangeset
for help on using the changeset viewer.