mirror of
https://github.com/python/cpython.git
synced 2025-08-03 08:34:29 +00:00
Merged revisions 77967,77969,78033,78055,78081,78085,78108 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r77967 | vinay.sajip | 2010-02-04 18:48:53 +0000 (Thu, 04 Feb 2010) | 1 line Logging: Implemented PEP 391. ........ r77969 | vinay.sajip | 2010-02-04 20:18:28 +0000 (Thu, 04 Feb 2010) | 1 line Removed spurious print statement. ........ r78033 | benjamin.peterson | 2010-02-06 22:08:15 +0000 (Sat, 06 Feb 2010) | 1 line make waiting for the server to start robust ........ r78055 | vinay.sajip | 2010-02-07 01:37:08 +0000 (Sun, 07 Feb 2010) | 1 line Issue #7868: logging: added loggerClass attribute to Manager. ........ r78081 | vinay.sajip | 2010-02-07 12:56:54 +0000 (Sun, 07 Feb 2010) | 1 line Issue #7869: logging: improved format-time diagnostics and removed some 1.5.2 support code. ........ r78085 | vinay.sajip | 2010-02-07 13:06:51 +0000 (Sun, 07 Feb 2010) | 1 line logging: Removed some more 1.5.2 support code. ........ r78108 | vinay.sajip | 2010-02-08 21:18:15 +0000 (Mon, 08 Feb 2010) | 1 line logging: gingerly re-enabling skipped tests after improving thread sync code in configurator. ........
This commit is contained in:
Vinay Sajip
parent
6e796a1361
commit
db81c4c63a
5 changed files with 1286 additions and 75 deletions
|
|
@ -30,6 +30,7 @@ import copy
|
|||
import pickle
|
||||
import io
|
||||
import gc
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import select
|
||||
|
|
@ -39,7 +40,8 @@ import string
|
|||
import struct
|
||||
import sys
|
||||
import tempfile
|
||||
from test.support import captured_stdout, run_with_locale, run_unittest
|
||||
from test.support import captured_stdout, run_with_locale, run_unittest,\
|
||||
find_unused_port
|
||||
import textwrap
|
||||
import threading
|
||||
import time
|
||||
|
|
@ -85,6 +87,10 @@ class BaseTest(unittest.TestCase):
|
|||
level."""
|
||||
self.stream.close()
|
||||
self.root_logger.removeHandler(self.root_hdlr)
|
||||
while self.root_logger.handlers:
|
||||
h = self.root_logger.handlers[0]
|
||||
self.root_logger.removeHandler(h)
|
||||
h.close()
|
||||
self.root_logger.setLevel(self.original_logging_level)
|
||||
logging._acquireLock()
|
||||
try:
|
||||
|
|
@ -632,14 +638,8 @@ class ConfigFileTest(BaseTest):
|
|||
"""
|
||||
|
||||
def apply_config(self, conf):
|
||||
try:
|
||||
fn = tempfile.mktemp(".ini")
|
||||
f = open(fn, "w")
|
||||
f.write(textwrap.dedent(conf))
|
||||
f.close()
|
||||
logging.config.fileConfig(fn)
|
||||
finally:
|
||||
os.remove(fn)
|
||||
file = io.StringIO(textwrap.dedent(conf))
|
||||
logging.config.fileConfig(file)
|
||||
|
||||
def test_config0_ok(self):
|
||||
# A simple config file which overrides the default settings.
|
||||
|
|
@ -938,15 +938,728 @@ class WarningsTest(BaseTest):
|
|||
finally:
|
||||
logging.captureWarnings(False)
|
||||
|
||||
|
||||
def formatFunc(format, datefmt=None):
|
||||
return logging.Formatter(format, datefmt)
|
||||
|
||||
def handlerFunc():
|
||||
return logging.StreamHandler()
|
||||
|
||||
class CustomHandler(logging.StreamHandler):
|
||||
pass
|
||||
|
||||
class ConfigDictTest(BaseTest):
|
||||
|
||||
"""Reading logging config from a dictionary."""
|
||||
|
||||
expected_log_pat = r"^([\w]+) \+\+ ([\w]+)$"
|
||||
|
||||
# config0 is a standard configuration.
|
||||
config0 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
}
|
||||
|
||||
# config1 adds a little to the standard configuration.
|
||||
config1 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
# config2 has a subtle configuration error that should be reported
|
||||
config2 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdbout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
#As config1 but with a misspelt level on a handler
|
||||
config2a = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NTOSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
#As config1 but with a misspelt level on a logger
|
||||
config2b = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WRANING',
|
||||
},
|
||||
}
|
||||
|
||||
# config3 has a less subtle configuration error
|
||||
config3 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'misspelled_name',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
# config4 specifies a custom formatter class to be loaded
|
||||
config4 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'()' : __name__ + '.ExceptionFormatter',
|
||||
'format' : '%(levelname)s:%(name)s:%(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'NOTSET',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
}
|
||||
|
||||
# As config4 but using an actual callable rather than a string
|
||||
config4a = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'()' : ExceptionFormatter,
|
||||
'format' : '%(levelname)s:%(name)s:%(message)s',
|
||||
},
|
||||
'form2' : {
|
||||
'()' : __name__ + '.formatFunc',
|
||||
'format' : '%(levelname)s:%(name)s:%(message)s',
|
||||
},
|
||||
'form3' : {
|
||||
'()' : formatFunc,
|
||||
'format' : '%(levelname)s:%(name)s:%(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
'hand2' : {
|
||||
'()' : handlerFunc,
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'NOTSET',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
}
|
||||
|
||||
# config5 specifies a custom handler class to be loaded
|
||||
config5 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : __name__ + '.CustomHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
# config6 specifies a custom handler class to be loaded
|
||||
# but has bad arguments
|
||||
config6 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : __name__ + '.CustomHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
'9' : 'invalid parameter name',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
#config 7 does not define compiler.parser but defines compiler.lexer
|
||||
#so compiler.parser should be disabled after applying it
|
||||
config7 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.lexer' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
config8 = {
|
||||
'disable_existing_loggers' : False,
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
'compiler.lexer' : {
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
config9 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'WARNING',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'WARNING',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'NOTSET',
|
||||
},
|
||||
}
|
||||
|
||||
config9a = {
|
||||
'incremental' : True,
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'INFO',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
config9b = {
|
||||
'incremental' : True,
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'level' : 'INFO',
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'INFO',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
#As config1 but with a filter added
|
||||
config10 = {
|
||||
'formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'filters' : {
|
||||
'filt1' : {
|
||||
'name' : 'compiler.parser',
|
||||
},
|
||||
},
|
||||
'handlers' : {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
'filters' : ['filt1'],
|
||||
},
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'filters' : ['filt1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
}
|
||||
|
||||
#As config1 but using cfg:// references
|
||||
config11 = {
|
||||
'true_formatters': {
|
||||
'form1' : {
|
||||
'format' : '%(levelname)s ++ %(message)s',
|
||||
},
|
||||
},
|
||||
'handler_configs': {
|
||||
'hand1' : {
|
||||
'class' : 'logging.StreamHandler',
|
||||
'formatter' : 'form1',
|
||||
'level' : 'NOTSET',
|
||||
'stream' : 'ext://sys.stdout',
|
||||
},
|
||||
},
|
||||
'formatters' : 'cfg://true_formatters',
|
||||
'handlers' : {
|
||||
'hand1' : 'cfg://handler_configs[hand1]',
|
||||
},
|
||||
'loggers' : {
|
||||
'compiler.parser' : {
|
||||
'level' : 'DEBUG',
|
||||
'handlers' : ['hand1'],
|
||||
},
|
||||
},
|
||||
'root' : {
|
||||
'level' : 'WARNING',
|
||||
},
|
||||
}
|
||||
|
||||
def apply_config(self, conf):
|
||||
logging.config.dictConfig(conf)
|
||||
|
||||
def test_config0_ok(self):
|
||||
# A simple config which overrides the default settings.
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config0)
|
||||
logger = logging.getLogger()
|
||||
# Won't output anything
|
||||
logger.info(self.next_message())
|
||||
# Outputs a message
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('ERROR', '2'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config1_ok(self, config=config1):
|
||||
# A config defining a sub-parser as well.
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(config)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '1'),
|
||||
('ERROR', '2'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config2_failure(self):
|
||||
# A simple config which overrides the default settings.
|
||||
self.assertRaises(Exception, self.apply_config, self.config2)
|
||||
|
||||
def test_config2a_failure(self):
|
||||
# A simple config which overrides the default settings.
|
||||
self.assertRaises(Exception, self.apply_config, self.config2a)
|
||||
|
||||
def test_config2b_failure(self):
|
||||
# A simple config which overrides the default settings.
|
||||
self.assertRaises(Exception, self.apply_config, self.config2b)
|
||||
|
||||
def test_config3_failure(self):
|
||||
# A simple config which overrides the default settings.
|
||||
self.assertRaises(Exception, self.apply_config, self.config3)
|
||||
|
||||
def test_config4_ok(self):
|
||||
# A config specifying a custom formatter class.
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config4)
|
||||
#logger = logging.getLogger()
|
||||
try:
|
||||
raise RuntimeError()
|
||||
except RuntimeError:
|
||||
logging.exception("just testing")
|
||||
sys.stdout.seek(0)
|
||||
self.assertEquals(output.getvalue(),
|
||||
"ERROR:root:just testing\nGot a [RuntimeError]\n")
|
||||
# Original logger output is empty
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config4a_ok(self):
|
||||
# A config specifying a custom formatter class.
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config4a)
|
||||
#logger = logging.getLogger()
|
||||
try:
|
||||
raise RuntimeError()
|
||||
except RuntimeError:
|
||||
logging.exception("just testing")
|
||||
sys.stdout.seek(0)
|
||||
self.assertEquals(output.getvalue(),
|
||||
"ERROR:root:just testing\nGot a [RuntimeError]\n")
|
||||
# Original logger output is empty
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config5_ok(self):
|
||||
self.test_config1_ok(config=self.config5)
|
||||
|
||||
def test_config6_failure(self):
|
||||
self.assertRaises(Exception, self.apply_config, self.config6)
|
||||
|
||||
def test_config7_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config1)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '1'),
|
||||
('ERROR', '2'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config7)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
self.assertTrue(logger.disabled)
|
||||
logger = logging.getLogger("compiler.lexer")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '3'),
|
||||
('ERROR', '4'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
#Same as test_config_7_ok but don't disable old loggers.
|
||||
def test_config_8_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config1)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '1'),
|
||||
('ERROR', '2'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config8)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
self.assertFalse(logger.disabled)
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
logger = logging.getLogger("compiler.lexer")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '3'),
|
||||
('ERROR', '4'),
|
||||
('INFO', '5'),
|
||||
('ERROR', '6'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
def test_config_9_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config9)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
#Nothing will be output since both handler and logger are set to WARNING
|
||||
logger.info(self.next_message())
|
||||
self.assert_log_lines([], stream=output)
|
||||
self.apply_config(self.config9a)
|
||||
#Nothing will be output since both handler is still set to WARNING
|
||||
logger.info(self.next_message())
|
||||
self.assert_log_lines([], stream=output)
|
||||
self.apply_config(self.config9b)
|
||||
#Message should now be output
|
||||
logger.info(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '3'),
|
||||
], stream=output)
|
||||
|
||||
def test_config_10_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.apply_config(self.config10)
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger('compiler')
|
||||
#Not output, because filtered
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger('compiler.lexer')
|
||||
#Not output, because filtered
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger("compiler.parser.codegen")
|
||||
#Output, as not filtered
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('WARNING', '1'),
|
||||
('ERROR', '4'),
|
||||
], stream=output)
|
||||
|
||||
def test_config11_ok(self):
|
||||
self.test_config1_ok(self.config11)
|
||||
|
||||
def setup_via_listener(self, text):
|
||||
port = find_unused_port()
|
||||
t = logging.config.listen(port)
|
||||
t.start()
|
||||
t.ready.wait()
|
||||
t.ready.clear()
|
||||
text = text.encode('utf-8')
|
||||
try:
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||
sock.settimeout(2.0)
|
||||
sock.connect(('localhost', port))
|
||||
|
||||
slen = struct.pack('>L', len(text))
|
||||
s = slen + text
|
||||
sentsofar = 0
|
||||
left = len(s)
|
||||
while left > 0:
|
||||
sent = sock.send(s[sentsofar:])
|
||||
sentsofar += sent
|
||||
left -= sent
|
||||
sock.close()
|
||||
finally:
|
||||
t.ready.wait(2.0)
|
||||
logging.config.stopListening()
|
||||
t.join(2.0)
|
||||
|
||||
def test_listen_config_10_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.setup_via_listener(json.dumps(self.config10))
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger('compiler')
|
||||
#Not output, because filtered
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger('compiler.lexer')
|
||||
#Not output, because filtered
|
||||
logger.warning(self.next_message())
|
||||
logger = logging.getLogger("compiler.parser.codegen")
|
||||
#Output, as not filtered
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('WARNING', '1'),
|
||||
('ERROR', '4'),
|
||||
], stream=output)
|
||||
|
||||
def test_listen_config_1_ok(self):
|
||||
with captured_stdout() as output:
|
||||
self.setup_via_listener(textwrap.dedent(ConfigFileTest.config1))
|
||||
logger = logging.getLogger("compiler.parser")
|
||||
# Both will output a message
|
||||
logger.info(self.next_message())
|
||||
logger.error(self.next_message())
|
||||
self.assert_log_lines([
|
||||
('INFO', '1'),
|
||||
('ERROR', '2'),
|
||||
], stream=output)
|
||||
# Original logger output is empty.
|
||||
self.assert_log_lines([])
|
||||
|
||||
|
||||
class ManagerTest(BaseTest):
|
||||
def test_manager_loggerclass(self):
|
||||
logged = []
|
||||
|
||||
class MyLogger(logging.Logger):
|
||||
def _log(self, level, msg, args, exc_info=None, extra=None):
|
||||
logged.append(msg)
|
||||
|
||||
man = logging.Manager(None)
|
||||
self.assertRaises(TypeError, man.setLoggerClass, int)
|
||||
man.setLoggerClass(MyLogger)
|
||||
logger = man.getLogger('test')
|
||||
logger.warning('should appear in logged')
|
||||
logging.warning('should not appear in logged')
|
||||
|
||||
self.assertEqual(logged, ['should appear in logged'])
|
||||
|
||||
|
||||
# Set the locale to the platform-dependent default. I have no idea
|
||||
# why the test does this, but in any case we save the current locale
|
||||
# first and restore it at the end.
|
||||
@run_with_locale('LC_ALL', '')
|
||||
def test_main():
|
||||
run_unittest(BuiltinLevelsTest, BasicFilterTest,
|
||||
CustomLevelsAndFiltersTest, MemoryHandlerTest,
|
||||
ConfigFileTest, SocketHandlerTest, MemoryTest,
|
||||
EncodingTest, WarningsTest)
|
||||
CustomLevelsAndFiltersTest, MemoryHandlerTest,
|
||||
ConfigFileTest, SocketHandlerTest, MemoryTest,
|
||||
EncodingTest, WarningsTest, ConfigDictTest, ManagerTest)
|
||||
|
||||
if __name__ == "__main__":
|
||||
test_main()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue