Default LogLevel for tests is now 'info'

pull/574/head
jMyles 2018-11-17 11:27:53 -08:00
parent 9be9ac7370
commit 854524c7ef
2 changed files with 25 additions and 25 deletions

View File

@ -15,13 +15,13 @@ You should have received a copy of the GNU General Public License
along with nucypher. If not, see <https://www.gnu.org/licenses/>.
"""
import datetime
import pathlib
from sentry_sdk import capture_exception, add_breadcrumb
from twisted.logger import FileLogObserver, jsonFileLogObserver
from twisted.python.log import ILogObserver
from twisted.logger import ILogObserver
from twisted.logger import LogLevel
from twisted.python.logfile import DailyLogFile
from zope.interface import provider
@ -59,21 +59,21 @@ def getTextFileObserver():
return observer
@provider(ILogObserver)
def simpleObserver(event):
message = '{level} ({source}): {message}'.format(level=event.get('log_level').name.upper(),
source=event.get('log_namespace'),
message=event.get('log_format'))
print(message)
class SimpleObserver:
def __init__(self, log_level_name="info"):
self.log_level = LogLevel.levelWithName(log_level_name)
@provider(ILogObserver)
def __call__(self, event):
if event['log_level'] >= self.log_level:
message = '{} ({}): {}'.format(event.get('log_level').name.upper(),
event.get('log_namespace'),
event.get('log_format'))
print(message)
@provider(ILogObserver)
def logToSentry(event):
"""
Twisted observer for Sentry...
Capture tracebacks and leave a trail of breadcrumbs.
"""
# Handle Logs
if not event.get('isError') or 'failure' not in event:
add_breadcrumb(level=event.get('log_level').name,

View File

@ -16,16 +16,13 @@ along with nucypher. If not, see <https://www.gnu.org/licenses/>.
"""
import pytest
from twisted.logger import globalLogPublisher
from twisted.logger import globalLogPublisher, LogLevel
from nucypher.cli import NucypherClickConfig
from nucypher.utilities.logging import simpleObserver
from nucypher.utilities.logging import SimpleObserver
# Logger Configuration
NucypherClickConfig.log_to_sentry = False
globalLogPublisher.addObserver(simpleObserver)
# Pytest configuration
pytest_plugins = [
@ -41,9 +38,12 @@ def pytest_addoption(parser):
def pytest_collection_modifyitems(config, items):
if config.getoption("--runslow"): # --runslow given in cli: do not skip slow tests
return
skip_slow = pytest.mark.skip(reason="need --runslow option to run")
for item in items:
if "slow" in item.keywords:
item.add_marker(skip_slow)
if not config.getoption("--runslow"): # --runslow given in cli: do not skip slow tests
skip_slow = pytest.mark.skip(reason="need --runslow option to run")
for item in items:
if "slow" in item.keywords:
item.add_marker(skip_slow)
log_level_name = config.getoption("--log-level", "info", skip=True)
observer = SimpleObserver(log_level_name)
globalLogPublisher.addObserver(observer)