Changeset 136036 in webkit

Timestamp:

Nov 28, 2012, 11:54:25 AM (12 years ago)

Author:

zandobersek@gmail.com

Message:

Remove deprecated logging usage from QueueEngine
​https://bugs.webkit.org/show_bug.cgi?id=103532

Reviewed by Dirk Pranke.

Replace usage of deprecated logging in webkitpy.tool.bot.queueengine with
logging through the Logger object. The unit test is modified to reflect
these changes.

After these changes the deprecated logging (i.e. logging to stderr) is not
used anymore through webkitpy and can be removed.

• Scripts/webkitpy/tool/bot/queueengine.py:

(QueueEngine.exit_after_handled_error):
(QueueEngine.run):
(QueueEngine._stopping):
(QueueEngine._sleep):

• Scripts/webkitpy/tool/bot/queueengine_unittest.py:

(QueueEngineTest._run_engine):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/bot/queueengine.py (modified) (6 diffs)
• Scripts/webkitpy/tool/bot/queueengine_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-11-28  Zan Dobersek  <zandobersek@gmail.com>
+
+        Remove deprecated logging usage from QueueEngine
+        https://bugs.webkit.org/show_bug.cgi?id=103532
+
+        Reviewed by Dirk Pranke.
+
+        Replace usage of deprecated logging in webkitpy.tool.bot.queueengine with
+        logging through the Logger object. The unit test is modified to reflect
+        these changes.
+
+        After these changes the deprecated logging (i.e. logging to stderr) is not
+        used anymore through webkitpy and can be removed.
+
+        * Scripts/webkitpy/tool/bot/queueengine.py:
+        (QueueEngine.exit_after_handled_error):
+        (QueueEngine.run):
+        (QueueEngine._stopping):
+        (QueueEngine._sleep):
+        * Scripts/webkitpy/tool/bot/queueengine_unittest.py:
+        (QueueEngineTest._run_engine):
+
 2012-11-28  Nate Chapin  <japhet@chromium.org>
 

trunk/Tools/Scripts/webkitpy/tool/bot/queueengine.py

@@ -28 +28 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import logging
 import sys
 import traceback
@@ -34 +35 @@
 
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.system.deprecated_logging import log, OutputTee
+from webkitpy.common.system.deprecated_logging import OutputTee
+
+_log = logging.getLogger(__name__)
 
 
@@ -81 +84 @@
     @classmethod
     def exit_after_handled_error(cls, error):
-        log(error)
+        _log.error(error)
         sys.exit(cls.handled_error_code)
 
@@ -101 +104 @@
                 try:
                     if not self._delegate.process_work_item(work_item):
-                        log("Unable to process work item.")
+                        _log.warning("Unable to process work item.")
                         continue
                 except ScriptError, e:
@@ -124 +127 @@
 
     def _stopping(self, message):
-        log("\n%s" % message)
+        _log.info("\n%s" % message)
         self._delegate.stop_work_queue(message)
         # Be careful to shut down our OutputTee or the unit tests will be unhappy.
@@ -155 +158 @@
 
     def _sleep(self, message):
-        log(self._sleep_message(message))
+        _log.info(self._sleep_message(message))
         self._wakeup_event.wait(self.seconds_to_sleep)
         self._wakeup_event.clear()

trunk/Tools/Scripts/webkitpy/tool/bot/queueengine_unittest.py

@@ -146 +146 @@
         if not termination_message:
             termination_message = "Delegate terminated queue."
-        expected_stderr = "\n%s\n" % termination_message
-        OutputCapture().assert_outputs(self, engine.run, expected_stderr=expected_stderr)
+        expected_logs = "\n%s\n" % termination_message
+        OutputCapture().assert_outputs(self, engine.run, expected_logs=expected_logs)
 
     def _test_terminating_queue(self, exception, termination_message):