Changeset 84210 in webkit

Timestamp:

Apr 18, 2011 4:43:54 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Eric Seidel.

new-run-webkit-tests: obsolete old threading code, part 1
​https://bugs.webkit.org/show_bug.cgi?id=58752

This patch removes support for the 'old-inline' and
'old-threads' worker models, and deletes the corresponding code.
Now that the new code is stable, this stuff is no longer
necessary.

• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py: Removed.
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py: Removed.
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py: Removed.
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py (deleted)
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py (deleted)
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py (deleted)
• Scripts/webkitpy/layout_tests/layout_package/test_runner.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-18  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests: obsolete old threading code, part 1
+        https://bugs.webkit.org/show_bug.cgi?id=58752
+
+        This patch removes support for the 'old-inline' and
+        'old-threads' worker models, and deletes the corresponding code.
+        Now that the new code is stable, this stuff is no longer
+        necessary.
+
+        * Scripts/webkitpy/layout_tests/layout_package/dump_render_tree_thread.py: Removed.
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker.py: Removed.
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py: Removed.
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-04-18  Dirk Pranke  <dpranke@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -47 +47 @@
 import time
 
-from webkitpy.layout_tests.layout_package import dump_render_tree_thread
 from webkitpy.layout_tests.layout_package import json_layout_results_generator
 from webkitpy.layout_tests.layout_package import json_results_generator
-from webkitpy.layout_tests.layout_package import message_broker
 from webkitpy.layout_tests.layout_package import printing
 from webkitpy.layout_tests.layout_package import test_expectations
@@ -549 +547 @@
             result_summary: summary object to populate with the results
         """
-
-        self._printer.print_update('Sharding tests ...')
-        test_lists = self._shard_tests(file_list,
-            (int(self._options.child_processes) > 1) and not self._options.experimental_fully_parallel)
-        filename_queue = Queue.Queue()
-        for item in test_lists:
-            filename_queue.put(item)
-
-        num_workers = self._num_workers(len(test_lists))
-
-        self._message_broker = message_broker.get(self._port, self._options)
-        broker = self._message_broker
-        self._current_filename_queue = filename_queue
-        self._current_result_summary = result_summary
-
-        self._printer.print_update('Starting %s ...' %
-                                   grammar.pluralize('worker', num_workers))
-        if not self._options.dry_run:
-            threads = broker.start_workers(self)
-        else:
-            threads = {}
-
-        self._printer.print_update("Starting testing ...")
-        keyboard_interrupted = False
-        interrupted = False
-        if not self._options.dry_run:
-            try:
-                broker.run_message_loop()
-            except KeyboardInterrupt:
-                _log.info("Interrupted, exiting")
-                broker.cancel_workers()
-                keyboard_interrupted = True
-                interrupted = True
-            except TestRunInterruptedException, e:
-                _log.info(e.reason)
-                broker.cancel_workers()
-                interrupted = True
-            except:
-                # Unexpected exception; don't try to clean up workers.
-                _log.info("Exception raised, exiting")
-                raise
-
-        thread_timings, test_timings, individual_test_timings = \
-            self._collect_timing_info(threads)
-
-        broker.cleanup()
-        self._message_broker = None
-        return (interrupted, keyboard_interrupted, thread_timings, test_timings,
-                individual_test_timings)
+        raise NotImplementedError()
 
     def update(self):

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -90 +90 @@
     num_unexpected_results = -1
     try:
-        if options.worker_model in ('inline', 'threads', 'processes'):
-            runner = test_runner2.TestRunner2(port, options, printer)
-        else:
-            runner = test_runner.TestRunner(port, options, printer)
-
+        runner = test_runner2.TestRunner2(port, options, printer)
         runner._print_config()
 
@@ -136 +132 @@
         options.worker_model = port_obj.default_worker_model()
 
-    if options.worker_model in ('inline', 'old-inline'):
+    if options.worker_model == 'inline':
         if options.child_processes and int(options.child_processes) > 1:
-            warnings.append("--worker-model=%s overrides --child-processes" % options.worker_model)
+            warnings.append("--worker-model=inline overrides --child-processes")
         options.child_processes = "1"
     if not options.child_processes:
@@ -382 +378 @@
         # FIXME: Display default number of child processes that will run.
         optparse.make_option("--worker-model", action="store",
-            default=None, help=("controls worker model. Valid values are 'old-inline', "
-                                "'old-threads', 'inline', 'threads', and 'processes'.")),
+            default=None, help=("controls worker model. Valid values are "
+                                "'inline', 'threads', and 'processes'.")),
         optparse.make_option("--experimental-fully-parallel",
             action="store_true", default=False,

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

@@ -55 +55 @@
 from webkitpy.layout_tests import port
 from webkitpy.layout_tests import run_webkit_tests
-from webkitpy.layout_tests.layout_package import dump_render_tree_thread
 from webkitpy.layout_tests.port.test import TestPort, TestDriver
 from webkitpy.layout_tests.port.test_files import is_reference_html_file
@@ -505 +504 @@
         self.assert_run_order('inline')
 
-    def test_run_order__old_inline(self):
-        self.assert_run_order('old-inline')
-
-    def test_run_order__threads(self):
-        self.assert_run_order('old-inline', child_processes='2')
-
-    def test_run_order__old_threads(self):
-        self.assert_run_order('old-threads', child_processes='2')
-
     def test_tolerance(self):
         class ImageDiffTestPort(TestPort):
@@ -548 +538 @@
         self.assertEqual(res, 0)
         self.assertTrue('--worker-model=inline overrides --child-processes\n' in err.get())
-
-    def test_worker_model__old_inline(self):
-        self.assertTrue(passing_run(['--worker-model', 'old-inline']))
-
-    def test_worker_model__old_threads(self):
-        self.assertTrue(passing_run(['--worker-model', 'old-threads']))
 
     def test_worker_model__processes(self):