Changeset 84596 in webkit

Timestamp:

Apr 21, 2011 8:29:59 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Eric Seidel.

new-run-webkit-tests: obsolete old code, part 5: rename message_broker2 to message_broker
​https://bugs.webkit.org/show_bug.cgi?id=58758

Since worker_mixin is now only used by worker, there's no point
in having it split across two files.

• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py: Added
• Scripts/webkitpy/layout_tests/layout_package/message_broker2.py: Removed.
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py: * Added
• Scripts/webkitpy/layout_tests/layout_package/message_broker2_unittest.py: Removed.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py (modified) (6 diffs)
• Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/layout_package/message_broker.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker2.py)
• Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py (moved) (moved from trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/message_broker2_unittest.py) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-21  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests: obsolete old code, part 5: rename message_broker2 to message_broker
+        https://bugs.webkit.org/show_bug.cgi?id=58758
+
+        Since worker_mixin is now only used by worker, there's no point
+        in having it split across two files.
+
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker.py:
+        * Scripts/webkitpy/layout_tests/layout_package/manager_worker_broker_unittest.py:
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker.py: Added
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker2.py: Removed.
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker_unittest.py: * Added
+        * Scripts/webkitpy/layout_tests/layout_package/message_broker2_unittest.py: Removed.
+
 2011-04-21  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -31 +31 @@
 This module implements a message broker that connects the manager
 (TestRunner2) to the workers: it provides a messaging abstraction and
-message loops (building on top of message_broker2), and handles starting
+message loops (building on top of message_broker), and handles starting
 workers by launching threads and/or processes depending on the
 requested configuration.
@@ -63 +63 @@
 from webkitpy.common.system import stack_utils
 from webkitpy.layout_tests import port
-from webkitpy.layout_tests.layout_package import message_broker2
+from webkitpy.layout_tests.layout_package import message_broker
 
 
@@ -92 +92 @@
         port - handle to layout_tests/port object for port-specific stuff
         options - optparse argument for command-line options
-        client - message_broker2.BrokerClient implementation to dispatch
+        client - message_broker.BrokerClient implementation to dispatch
             replies to.
         worker_class - type of workers to create. This class must implement
@@ -114 +114 @@
                          worker_model)
 
-    broker = message_broker2.Broker(options, queue_class)
+    broker = message_broker.Broker(options, queue_class)
     return manager_class(broker, port, options, client, worker_class)
 
 
-class AbstractWorker(message_broker2.BrokerClient):
+class AbstractWorker(message_broker.BrokerClient):
     def __init__(self, broker_connection, worker_number, options):
         """The constructor should be used to do any simple initialization
@@ -146 +146 @@
 
 
-class _ManagerConnection(message_broker2.BrokerConnection):
+class _ManagerConnection(message_broker.BrokerConnection):
     def __init__(self, broker, options, client, worker_class):
         """Base initialization for all Manager objects.
 
         Args:
-            broker: handle to the message_broker2 object
+            broker: handle to the message_broker object
             options: command line options object
             client: callback object (the caller)
             worker_class: class object to use to create workers.
         """
-        message_broker2.BrokerConnection.__init__(self, broker, client,
+        message_broker.BrokerConnection.__init__(self, broker, client,
             MANAGER_TOPIC, ANY_WORKER_TOPIC)
         self._options = options
@@ -211 +211 @@
 
 
-class _WorkerConnection(message_broker2.BrokerConnection):
+class _WorkerConnection(message_broker.BrokerConnection):
     def __init__(self, broker, worker_class, worker_number, options):
         self._client = worker_class(self, worker_number, options)
         self.name = self._client.name()
-        message_broker2.BrokerConnection.__init__(self, broker, self._client,
-                                                  ANY_WORKER_TOPIC, MANAGER_TOPIC)
+        message_broker.BrokerConnection.__init__(self, broker, self._client,
+                                                 ANY_WORKER_TOPIC, MANAGER_TOPIC)
 
     def cancel(self):

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

@@ -42 +42 @@
 from webkitpy.layout_tests import port
 from webkitpy.layout_tests.layout_package import manager_worker_broker
-from webkitpy.layout_tests.layout_package import message_broker2
+from webkitpy.layout_tests.layout_package import message_broker
 from webkitpy.layout_tests.layout_package import printing
 

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

@@ -29 +29 @@
 import unittest
 
-from webkitpy.layout_tests.layout_package import message_broker2
+from webkitpy.layout_tests.layout_package import message_broker
 
 # This file exists to test routines that aren't necessarily covered elsewhere;
-# most of the testing of message_broker2 will be covered under the tests in
+# most of the testing of message_broker will be covered under the tests in
 # the manager_worker_broker module.
 
@@ -38 +38 @@
 class MessageTest(unittest.TestCase):
     def test__no_body(self):
-        msg = message_broker2._Message('src', 'topic_name', 'message_name', None)
+        msg = message_broker._Message('src', 'topic_name', 'message_name', None)
         self.assertTrue(repr(msg))
         s = msg.dumps()
-        new_msg = message_broker2._Message.loads(s)
+        new_msg = message_broker._Message.loads(s)
         self.assertEqual(new_msg.name, 'message_name')
         self.assertEqual(new_msg.args, None)
@@ -48 +48 @@
 
     def test__body(self):
-        msg = message_broker2._Message('src', 'topic_name', 'message_name',
+        msg = message_broker._Message('src', 'topic_name', 'message_name',
                                       ('body', 0))
         self.assertTrue(repr(msg))
         s = msg.dumps()
-        new_msg = message_broker2._Message.loads(s)
+        new_msg = message_broker._Message.loads(s)
         self.assertEqual(new_msg.name, 'message_name')
         self.assertEqual(new_msg.args, ('body', 0))
@@ -67 +67 @@
     def test_brokerclient_is_abstract(self):
         # Test that we can't create an instance directly.
-        self.assertRaises(NotImplementedError, message_broker2.BrokerClient)
+        self.assertRaises(NotImplementedError, message_broker.BrokerClient)
 
-        class TestClient(message_broker2.BrokerClient):
+        class TestClient(message_broker.BrokerClient):
             def __init__(self):
                 pass