| Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/logutils_unittest.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
|
| index 0727e8d04375206d96517bbdf9e6c609923660bc..35722e8d7995af0c5ab111a19e2e1d3ce7cb32fe 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/logutils_unittest.py
|
| @@ -26,11 +26,13 @@ import logging
|
| import os
|
| import unittest
|
|
|
| +from webkitpy.common.system.logtesting import LogTesting
|
| from webkitpy.common.system.logtesting import TestLogStream
|
| from webkitpy.common.system import logutils
|
|
|
|
|
| class GetLoggerTest(unittest.TestCase):
|
| +
|
| """Tests get_logger()."""
|
|
|
| def test_get_logger_in_webkitpy(self):
|
| @@ -54,6 +56,7 @@ class GetLoggerTest(unittest.TestCase):
|
|
|
|
|
| class ConfigureLoggingTestBase(unittest.TestCase):
|
| +
|
| """Base class for configure_logging() unit tests."""
|
|
|
| def _logging_level(self):
|
| @@ -84,6 +87,7 @@ class ConfigureLoggingTestBase(unittest.TestCase):
|
|
|
| This method ensures that the logging configuration set up
|
| for a unit test does not affect logging in other unit tests.
|
| +
|
| """
|
| logger = self._log
|
| for handler in self._handlers:
|
| @@ -95,6 +99,7 @@ class ConfigureLoggingTestBase(unittest.TestCase):
|
|
|
|
|
| class ConfigureLoggingTest(ConfigureLoggingTestBase):
|
| +
|
| """Tests configure_logging() with the default logging level."""
|
|
|
| def _logging_level(self):
|
| @@ -119,7 +124,8 @@ class ConfigureLoggingTest(ConfigureLoggingTestBase):
|
| def test_two_messages(self):
|
| self._log.info("message1")
|
| self._log.info("message2")
|
| - self._assert_log_messages(["message1\n", "message2\n"])
|
| + self._assert_log_messages(["message1\n",
|
| + "message2\n"])
|
|
|
|
|
| class ConfigureLoggingVerboseTest(ConfigureLoggingTestBase):
|
| @@ -137,6 +143,7 @@ class ConfigureLoggingVerboseTest(ConfigureLoggingTestBase):
|
|
|
|
|
| class ConfigureLoggingCustomLevelTest(ConfigureLoggingTestBase):
|
| +
|
| """Tests configure_logging() with a custom logging level."""
|
|
|
| _level = 36
|
|
|