maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

Merge pull request #2554 from camilojimenez/2550-some-tests-fail

Browse source 
fix non-passing tests for logging on pytest >= 3.3.0
This commit is contained in:
David Lord 2017-12-14 12:21:34 -08:00 • committed by GitHub
commit 27a7171d42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/test_logging.py
View file

@ -9,14 +9,18 @@ from flask.logging import default_handler, has_level_handler, \
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def reset_logging(monkeypatch): def reset_logging(pytestconfig):
root_handlers = logging.root.handlers[:] root_handlers = logging.root.handlers[:]
logging.root.handlers = []
root_level = logging.root.level root_level = logging.root.level
logger = logging.getLogger('flask.app') logger = logging.getLogger('flask.app')
logger.handlers = [] logger.handlers = []
logger.setLevel(logging.NOTSET) logger.setLevel(logging.NOTSET)
logging_plugin = pytestconfig.pluginmanager.unregister(
name='logging-plugin')
yield yield
logging.root.handlers[:] = root_handlers logging.root.handlers[:] = root_handlers
@ -25,6 +29,9 @@ def reset_logging(monkeypatch):
logger.handlers = [] logger.handlers = []
logger.setLevel(logging.NOTSET) logger.setLevel(logging.NOTSET)
if logging_plugin:
pytestconfig.pluginmanager.register(logging_plugin, 'logging-plugin')
def test_logger(app): def test_logger(app):
assert app.logger.name == 'flask.app' assert app.logger.name == 'flask.app'