diff options
author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-03-22 15:27:52 (GMT) |
---|---|---|
committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-03-22 15:27:52 (GMT) |
commit | 5a63fe681363e6fe8ed0f68cf4d617b962d6490e (patch) | |
tree | 51e3896834df14fcbe2ca5408f93f1fc4e664ba8 /Lib/test/test_logging.py | |
parent | 671ddbe5a0afcd32203a334372f9db5f0ac076ba (diff) | |
parent | 340a4bb2fe38f7d203beb7890d75e0383e3cca7c (diff) | |
download | cpython-5a63fe681363e6fe8ed0f68cf4d617b962d6490e.zip cpython-5a63fe681363e6fe8ed0f68cf4d617b962d6490e.tar.gz cpython-5a63fe681363e6fe8ed0f68cf4d617b962d6490e.tar.bz2 |
Closes #17508: Merged fix from 3.3.
Diffstat (limited to 'Lib/test/test_logging.py')
-rw-r--r-- | Lib/test/test_logging.py | 39 |
1 files changed, 37 insertions, 2 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 0981704..f2ae095 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -# Copyright 2001-2012 by Vinay Sajip. All Rights Reserved. +# Copyright 2001-2013 by Vinay Sajip. All Rights Reserved. # # Permission to use, copy, modify, and distribute this software and its # documentation for any purpose and without fee is hereby granted, @@ -18,7 +18,7 @@ """Test harness for the logging module. Run all tests. -Copyright (C) 2001-2012 Vinay Sajip. All Rights Reserved. +Copyright (C) 2001-2013 Vinay Sajip. All Rights Reserved. """ import logging @@ -2415,6 +2415,36 @@ class ConfigDictTest(BaseTest): }, } + out_of_order = { + "version": 1, + "formatters": { + "mySimpleFormatter": { + "format": "%(asctime)s (%(name)s) %(levelname)s: %(message)s" + } + }, + "handlers": { + "fileGlobal": { + "class": "logging.StreamHandler", + "level": "DEBUG", + "formatter": "mySimpleFormatter" + }, + "bufferGlobal": { + "class": "logging.handlers.MemoryHandler", + "capacity": 5, + "formatter": "mySimpleFormatter", + "target": "fileGlobal", + "level": "DEBUG" + } + }, + "loggers": { + "mymodule": { + "level": "DEBUG", + "handlers": ["bufferGlobal"], + "propagate": "true" + } + } + } + def apply_config(self, conf): logging.config.dictConfig(conf) @@ -2787,6 +2817,11 @@ class ConfigDictTest(BaseTest): ('ERROR', '2'), ], pat=r"^[\w.]+ -> (\w+): (\d+)$") + def test_out_of_order(self): + self.apply_config(self.out_of_order) + handler = logging.getLogger('mymodule').handlers[0] + self.assertIsInstance(handler.target, logging.Handler) + def test_baseconfig(self): d = { 'atuple': (1, 2, 3), |