floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename name of registered logging plugin

This commit is contained in:
Thomas Hisch 2017-09-26 23:34:54 +02:00
parent 815dd19fb4
commit 0e83511d6d
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_pytest/logging.py
View File

@ -240,7 +240,8 @@ def get_actual_log_level(config, *setting_names):
def pytest_configure(config): def pytest_configure(config):
config.pluginmanager.register(LoggingPlugin(config), 'loggingp') config.pluginmanager.register(LoggingPlugin(config),
'logging-plugin')
class LoggingPlugin(object): class LoggingPlugin(object):

14
testing/logging/test_reporting.py
View File

@ -147,7 +147,7 @@ def test_log_cli_default_level(testdir):
import pytest import pytest
import logging import logging
def test_log_cli(request): def test_log_cli(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_cli_handler.level == logging.WARNING assert plugin.log_cli_handler.level == logging.WARNING
logging.getLogger('catchlog').info("This log message won't be shown") logging.getLogger('catchlog').info("This log message won't be shown")
logging.getLogger('catchlog').warning("This log message will be shown") logging.getLogger('catchlog').warning("This log message will be shown")
@ -180,7 +180,7 @@ def test_log_cli_level(testdir):
import pytest import pytest
import logging import logging
def test_log_cli(request): def test_log_cli(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_cli_handler.level == logging.INFO assert plugin.log_cli_handler.level == logging.INFO
logging.getLogger('catchlog').debug("This log message won't be shown") logging.getLogger('catchlog').debug("This log message won't be shown")
logging.getLogger('catchlog').info("This log message will be shown") logging.getLogger('catchlog').info("This log message will be shown")
@ -236,7 +236,7 @@ def test_log_cli_ini_level(testdir):
import pytest import pytest
import logging import logging
def test_log_cli(request): def test_log_cli(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_cli_handler.level == logging.INFO assert plugin.log_cli_handler.level == logging.INFO
logging.getLogger('catchlog').debug("This log message won't be shown") logging.getLogger('catchlog').debug("This log message won't be shown")
logging.getLogger('catchlog').info("This log message will be shown") logging.getLogger('catchlog').info("This log message will be shown")
@ -269,7 +269,7 @@ def test_log_file_cli(testdir):
import pytest import pytest
import logging import logging
def test_log_file(request): def test_log_file(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_file_handler.level == logging.WARNING assert plugin.log_file_handler.level == logging.WARNING
logging.getLogger('catchlog').info("This log message won't be shown") logging.getLogger('catchlog').info("This log message won't be shown")
logging.getLogger('catchlog').warning("This log message will be shown") logging.getLogger('catchlog').warning("This log message will be shown")
@ -300,7 +300,7 @@ def test_log_file_cli_level(testdir):
import pytest import pytest
import logging import logging
def test_log_file(request): def test_log_file(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_file_handler.level == logging.INFO assert plugin.log_file_handler.level == logging.INFO
logging.getLogger('catchlog').debug("This log message won't be shown") logging.getLogger('catchlog').debug("This log message won't be shown")
logging.getLogger('catchlog').info("This log message will be shown") logging.getLogger('catchlog').info("This log message will be shown")
@ -339,7 +339,7 @@ def test_log_file_ini(testdir):
import pytest import pytest
import logging import logging
def test_log_file(request): def test_log_file(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_file_handler.level == logging.WARNING assert plugin.log_file_handler.level == logging.WARNING
logging.getLogger('catchlog').info("This log message won't be shown") logging.getLogger('catchlog').info("This log message won't be shown")
logging.getLogger('catchlog').warning("This log message will be shown") logging.getLogger('catchlog').warning("This log message will be shown")
@ -375,7 +375,7 @@ def test_log_file_ini_level(testdir):
import pytest import pytest
import logging import logging
def test_log_file(request): def test_log_file(request):
plugin = request.config.pluginmanager.getplugin('loggingp') plugin = request.config.pluginmanager.getplugin('logging-plugin')
assert plugin.log_file_handler.level == logging.INFO assert plugin.log_file_handler.level == logging.INFO
logging.getLogger('catchlog').debug("This log message won't be shown") logging.getLogger('catchlog').debug("This log message won't be shown")
logging.getLogger('catchlog').info("This log message will be shown") logging.getLogger('catchlog').info("This log message will be shown")