Use 'init' helper from tests!

This commit is contained in:
Alexandre Aubin 2020-04-29 04:43:29 +02:00
parent 84e39a416a
commit 96e115c609

View file

@ -1,12 +1,11 @@
import os import os
import pytest import pytest
import sys import sys
import moulinette
import moulinette
from moulinette import m18n from moulinette import m18n
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError
from contextlib import contextmanager from contextlib import contextmanager
sys.path.append("..") sys.path.append("..")
@ -68,65 +67,7 @@ moulinette.core.Moulinette18n.n = new_m18nn
def pytest_cmdline_main(config): def pytest_cmdline_main(config):
"""Configure logging and initialize the moulinette"""
# Define loggers handlers
handlers = set(['tty'])
root_handlers = set(handlers)
# Define loggers level sys.path.insert(0, "/usr/lib/moulinette/")
level = 'DEBUG' import yunohost
if config.option.yunodebug: yunohost.init(debug=config.option.yunodebug)
tty_level = 'DEBUG'
else:
tty_level = 'INFO'
# Custom logging configuration
logging = {
'version': 1,
'disable_existing_loggers': True,
'formatters': {
'tty-debug': {
'format': '%(relativeCreated)-4d %(fmessage)s'
},
'precise': {
'format': '%(asctime)-15s %(levelname)-8s %(name)s %(funcName)s - %(fmessage)s'
},
},
'filters': {
'action': {
'()': 'moulinette.utils.log.ActionFilter',
},
},
'handlers': {
'tty': {
'level': tty_level,
'class': 'moulinette.interfaces.cli.TTYHandler',
'formatter': '',
},
},
'loggers': {
'yunohost': {
'level': level,
'handlers': handlers,
'propagate': False,
},
'moulinette': {
'level': level,
'handlers': [],
'propagate': True,
},
'moulinette.interface': {
'level': level,
'handlers': handlers,
'propagate': False,
},
},
'root': {
'level': level,
'handlers': root_handlers,
},
}
# Initialize moulinette
moulinette.init(logging_config=logging, _from_source=False)
moulinette.m18n.load_namespace('yunohost')