Skip to content

Commit

Permalink
Merge pull request #496 from davidszotten/drop_plugin_log_level_arg
Browse files Browse the repository at this point in the history
try dropping log-level pytest plugin arg
  • Loading branch information
davidszotten committed Dec 11, 2017
2 parents 67bfa49 + 438c6cf commit 4a90e78
Showing 1 changed file with 0 additions and 13 deletions.
13 changes: 0 additions & 13 deletions nameko/testing/pytest.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,6 @@ def pytest_addoption(parser):
default=False,
help='turn on eventlet hub blocking detection')

parser.addoption(
"--log-level", action="store",
default='DEBUG',
help=("The logging-level for the test run."))

parser.addoption(
"--amqp-uri", "--rabbit-amqp-uri",
action="store",
Expand All @@ -48,18 +43,10 @@ def pytest_load_initial_conftests():


def pytest_configure(config):
import logging
import sys

if config.option.blocking_detection: # pragma: no cover
from eventlet import debug
debug.hub_blocking_detection(True)

log_level = config.getoption('log_level')
if log_level is not None:
log_level = getattr(logging, log_level)
logging.basicConfig(level=log_level, stream=sys.stderr)


@pytest.fixture(autouse=True)
def always_warn_for_deprecation():
Expand Down

0 comments on commit 4a90e78

Please sign in to comment.