Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
6fac8171
Commit
6fac8171
authored
Oct 19, 2010
by
Vinay Sajip
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
logging: Added tests for _logRecordClass changes.
parent
7004bd1a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
51 additions
and
2 deletions
+51
-2
Lib/logging/__init__.py
Lib/logging/__init__.py
+8
-0
Lib/test/test_logging.py
Lib/test/test_logging.py
+41
-2
Misc/NEWS
Misc/NEWS
+2
-0
No files found.
Lib/logging/__init__.py
View file @
6fac8171
...
@@ -973,6 +973,7 @@ class Manager(object):
...
@@ -973,6 +973,7 @@ class Manager(object):
self
.
emittedNoHandlerWarning
=
0
self
.
emittedNoHandlerWarning
=
0
self
.
loggerDict
=
{}
self
.
loggerDict
=
{}
self
.
loggerClass
=
None
self
.
loggerClass
=
None
self
.
logRecordClass
=
None
def
getLogger
(
self
,
name
):
def
getLogger
(
self
,
name
):
"""
"""
...
@@ -1016,6 +1017,13 @@ class Manager(object):
...
@@ -1016,6 +1017,13 @@ class Manager(object):
+
klass
.
__name__
)
+
klass
.
__name__
)
self
.
loggerClass
=
klass
self
.
loggerClass
=
klass
def
setLogRecordClass
(
self
,
cls
):
"""
Set the class to be used when instantiating a log record with this
Manager.
"""
self
.
logRecordClass
=
cls
def
_fixupParents
(
self
,
alogger
):
def
_fixupParents
(
self
,
alogger
):
"""
"""
Ensure that there are either loggers or placeholders all the way
Ensure that there are either loggers or placeholders all the way
...
...
Lib/test/test_logging.py
View file @
6fac8171
...
@@ -127,7 +127,8 @@ class BaseTest(unittest.TestCase):
...
@@ -127,7 +127,8 @@ class BaseTest(unittest.TestCase):
except AttributeError:
except AttributeError:
# StringIO.StringIO lacks a reset() method.
# StringIO.StringIO lacks a reset() method.
actual_lines = stream.getvalue().splitlines()
actual_lines = stream.getvalue().splitlines()
self.assertEquals(len(actual_lines), len(expected_values))
self.assertEquals(len(actual_lines), len(expected_values),
'%s vs. %s' % (actual_lines, expected_values))
for actual, expected in zip(actual_lines, expected_values):
for actual, expected in zip(actual_lines, expected_values):
match = pat.search(actual)
match = pat.search(actual)
if not match:
if not match:
...
@@ -1766,6 +1767,44 @@ class ChildLoggerTest(BaseTest):
...
@@ -1766,6 +1767,44 @@ class ChildLoggerTest(BaseTest):
self.assertTrue(c2 is c3)
self.assertTrue(c2 is c3)
class DerivedLogRecord(logging.LogRecord):
pass
class LogRecordClassTest(BaseTest):
def setUp(self):
class CheckingFilter(logging.Filter):
def __init__(self, cls):
self.cls = cls
def filter(self, record):
t = type(record)
if t is not self.cls:
msg = 'Unexpected LogRecord type %s, expected %s' % (t,
self.cls)
raise TypeError(msg)
return True
BaseTest.setUp(self)
self.filter = CheckingFilter(DerivedLogRecord)
self.root_logger.addFilter(self.filter)
self.orig_cls = logging.getLogRecordClass()
def tearDown(self):
self.root_logger.removeFilter(self.filter)
BaseTest.tearDown(self)
logging.setLogRecordClass(self.orig_cls)
def test_logrecord_class(self):
self.assertRaises(TypeError, self.root_logger.warning,
self.next_message())
logging.setLogRecordClass(DerivedLogRecord)
self.root_logger.error(self.next_message())
self.assert_log_lines([
('root', 'ERROR', '2'),
])
class QueueHandlerTest(BaseTest):
class QueueHandlerTest(BaseTest):
# Do not bother with a logger name group.
# Do not bother with a logger name group.
expected_log_pat = r"
^
[
\
w
.]
+
->
([
\
w
]
+
):
([
\
d
]
+
)
$
"
expected_log_pat = r"
^
[
\
w
.]
+
->
([
\
w
]
+
):
([
\
d
]
+
)
$
"
...
@@ -1877,7 +1916,7 @@ def test_main():
...
@@ -1877,7 +1916,7 @@ def test_main():
CustomLevelsAndFiltersTest, MemoryHandlerTest,
CustomLevelsAndFiltersTest, MemoryHandlerTest,
ConfigFileTest, SocketHandlerTest, MemoryTest,
ConfigFileTest, SocketHandlerTest, MemoryTest,
EncodingTest, WarningsTest, ConfigDictTest, ManagerTest,
EncodingTest, WarningsTest, ConfigDictTest, ManagerTest,
ChildLoggerTest, QueueHandlerTest,
LogRecordClassTest,
ChildLoggerTest, QueueHandlerTest,
RotatingFileHandlerTest,
RotatingFileHandlerTest,
#TimedRotatingFileHandlerTest
#TimedRotatingFileHandlerTest
)
)
...
...
Misc/NEWS
View file @
6fac8171
...
@@ -34,6 +34,8 @@ Core and Builtins
...
@@ -34,6 +34,8 @@ Core and Builtins
Library
Library
-------
-------
- logging: Added tests for _logRecordClass changes.
- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes.
- Issue #10092: Properly reset locale in calendar.Locale*Calendar classes.
- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to
- logging: Added _logRecordClass, getLogRecordClass, setLogRecordClass to
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment