| OLD | NEW |
| 1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) | 1 # Copyright (C) 2010 Chris Jerdonek (cjerdonek@webkit.org) |
| 2 # | 2 # |
| 3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
| 4 # modification, are permitted provided that the following conditions | 4 # modification, are permitted provided that the following conditions |
| 5 # are met: | 5 # are met: |
| 6 # 1. Redistributions of source code must retain the above copyright | 6 # 1. Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # 2. Redistributions in binary form must reproduce the above copyright | 8 # 2. Redistributions in binary form must reproduce the above copyright |
| 9 # notice, this list of conditions and the following disclaimer in the | 9 # notice, this list of conditions and the following disclaimer in the |
| 10 # documentation and/or other materials provided with the distribution. | 10 # documentation and/or other materials provided with the distribution. |
| 11 # | 11 # |
| 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND | 12 # THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND |
| 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | 13 # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED |
| 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | 14 # WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE |
| 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR | 15 # DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR |
| 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | 16 # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL |
| 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | 17 # DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR |
| 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | 18 # SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
| 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | 19 # CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, |
| 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 20 # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 21 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 22 | 22 |
| 23 """Unit tests for logutils.py.""" | |
| 24 | |
| 25 import logging | 23 import logging |
| 26 import os | |
| 27 import unittest | 24 import unittest |
| 28 | 25 |
| 29 from webkitpy.common.system.logtesting import LogTesting | |
| 30 from webkitpy.common.system.logtesting import TestLogStream | 26 from webkitpy.common.system.logtesting import TestLogStream |
| 31 from webkitpy.common.system import logutils | 27 from webkitpy.common.system.logutils import configure_logging |
| 32 | |
| 33 | |
| 34 class GetLoggerTest(unittest.TestCase): | |
| 35 | |
| 36 """Tests get_logger().""" | |
| 37 | |
| 38 def test_get_logger_in_webkitpy(self): | |
| 39 logger = logutils.get_logger(__file__) | |
| 40 self.assertEqual(logger.name, "webkitpy.common.system.logutils_unittest"
) | |
| 41 | |
| 42 def test_get_logger_not_in_webkitpy(self): | |
| 43 # Temporarily change the working directory so that we | |
| 44 # can test get_logger() for a path outside of webkitpy. | |
| 45 working_directory = os.getcwd() | |
| 46 root_dir = "/" | |
| 47 os.chdir(root_dir) | |
| 48 | |
| 49 logger = logutils.get_logger("/Tools/Scripts/test-webkitpy") | |
| 50 self.assertEqual(logger.name, "test-webkitpy") | |
| 51 | |
| 52 logger = logutils.get_logger("/Tools/Scripts/test-webkitpy.py") | |
| 53 self.assertEqual(logger.name, "test-webkitpy") | |
| 54 | |
| 55 os.chdir(working_directory) | |
| 56 | 28 |
| 57 | 29 |
| 58 class ConfigureLoggingTestBase(unittest.TestCase): | 30 class ConfigureLoggingTestBase(unittest.TestCase): |
| 59 | |
| 60 """Base class for configure_logging() unit tests.""" | 31 """Base class for configure_logging() unit tests.""" |
| 61 | 32 |
| 62 def _logging_level(self): | 33 def _logging_level(self): |
| 63 raise Exception("Not implemented.") | 34 raise Exception("Not implemented.") |
| 64 | 35 |
| 65 def setUp(self): | 36 def setUp(self): |
| 66 log_stream = TestLogStream(self) | 37 log_stream = TestLogStream(self) |
| 67 | 38 |
| 68 # Use a logger other than the root logger or one prefixed with | 39 # Use a logger other than the root logger or one prefixed with |
| 69 # "webkitpy." so as not to conflict with test-webkitpy logging. | 40 # "webkitpy." so as not to conflict with test-webkitpy logging. |
| 70 logger = logging.getLogger("unittest") | 41 logger = logging.getLogger("unittest") |
| 71 | 42 |
| 72 # Configure the test logger not to pass messages along to the | 43 # Configure the test logger not to pass messages along to the |
| 73 # root logger. This prevents test messages from being | 44 # root logger. This prevents test messages from being |
| 74 # propagated to loggers used by test-webkitpy logging (e.g. | 45 # propagated to loggers used by test-webkitpy logging (e.g. |
| 75 # the root logger). | 46 # the root logger). |
| 76 logger.propagate = False | 47 logger.propagate = False |
| 77 | 48 |
| 78 logging_level = self._logging_level() | 49 logging_level = self._logging_level() |
| 79 self._handlers = logutils.configure_logging(logging_level=logging_level, | 50 self._handlers = configure_logging(logging_level=logging_level, logger=l
ogger, stream=log_stream) |
| 80 logger=logger, | |
| 81 stream=log_stream) | |
| 82 self._log = logger | 51 self._log = logger |
| 83 self._log_stream = log_stream | 52 self._log_stream = log_stream |
| 84 | 53 |
| 85 def tearDown(self): | 54 def tearDown(self): |
| 86 """Reset logging to its original state. | 55 """Reset logging to its original state. |
| 87 | 56 |
| 88 This method ensures that the logging configuration set up | 57 This method ensures that the logging configuration set up |
| 89 for a unit test does not affect logging in other unit tests. | 58 for a unit test does not affect logging in other unit tests. |
| 90 """ | 59 """ |
| 91 logger = self._log | 60 logger = self._log |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 def _logging_level(self): | 119 def _logging_level(self): |
| 151 return self._level | 120 return self._level |
| 152 | 121 |
| 153 def test_logged_message(self): | 122 def test_logged_message(self): |
| 154 self._log.log(self._level, "test message") | 123 self._log.log(self._level, "test message") |
| 155 self._assert_log_messages(["test message\n"]) | 124 self._assert_log_messages(["test message\n"]) |
| 156 | 125 |
| 157 def test_below_threshold_message(self): | 126 def test_below_threshold_message(self): |
| 158 self._log.log(self._level - 1, "test message") | 127 self._log.log(self._level - 1, "test message") |
| 159 self._assert_log_messages([]) | 128 self._assert_log_messages([]) |
| OLD | NEW |