Skip to content

A
avocado

openeuler / avocado

通知 0
Star 0
Fork 0
A
avocado

体验新版 GitCode，发现更多精彩内容 >>

提交 f2ca8094 编写于 作者: L Lukáš Doktor
浏览文件
操作

avocado: Use output.LOG_{UI,JOB} in Avocado 

Currently we hardcode the "avocado.app" and "avocado.test" loggers
everywhere in Avocado, let's use the newly defined
`avocado.core.output.LOG_{UI,JOB}` variables everywhere in Avocado
except of `avocado.utils`, which shouldn't have used this interface in
the first place and will be subject of change in the future.
Signed-off-by: NLukáš Doktor <ldoktor@redhat.com>
上级 14f4152e
显示空白变更内容
内联 并排
Showing with 278 addition and 318 deletion
avocado/core/data_dir.py
浏览文件 @ f2ca8094
......@@ -25,7 +25,6 @@ The general reasoning to find paths is:
* The next best location is the default system wide one.
* The next best location is the default user specific one.
"""
import logging
import os
import sys
import shutil
......@@ -34,6 +33,7 @@ import tempfile
from . import job_id
from . import settings
from .output import LOG_JOB
from ..utils import path as utils_path
from ..utils.data_structures import Borg
......@@ -53,8 +53,6 @@ USER_TEST_DIR = os.path.join(USER_BASE_DIR, 'tests')
USER_DATA_DIR = os.path.join(USER_BASE_DIR, 'data')
USER_LOG_DIR = os.path.join(USER_BASE_DIR, 'job-results')
LOG = logging.getLogger('avocado.test')
def _get_settings_dir(dir_name):
"""
......@@ -206,7 +204,7 @@ class _TmpDirTracker(Borg):
self.tmp_dir = tempfile.mkdtemp(prefix='avocado_',
dir=self.basedir)
elif basedir is not None and basedir != self.basedir:
LOG.error("The tmp_dir was already created. The new basedir "
LOG_JOB.error("The tmp_dir was already created. The new basedir "
"you're trying to provide will have no effect.")
return self.tmp_dir
......
avocado/core/dispatcher.py
浏览文件 @ f2ca8094
......@@ -15,12 +15,12 @@
"""Extensions/plugins dispatchers."""
import copy
import logging
import sys
from stevedore import EnabledExtensionManager
from .settings import settings
from .output import LOG_UI
from ..utils import stacktrace
......@@ -183,7 +183,6 @@ class ResultEventsDispatcher(Dispatcher):
super(ResultEventsDispatcher, self).__init__(
'avocado.plugins.result_events',
invoke_kwds={'args': args})
self.log = logging.getLogger("avocado.app")
def map_method(self, method_name, *args):
for ext in self.extensions:
......@@ -196,7 +195,7 @@ class ResultEventsDispatcher(Dispatcher):
except KeyboardInterrupt:
raise
except:
self.log.error('Error running method "%s" of plugin "%s": %s',
LOG_UI.error('Error running method "%s" of plugin "%s": %s',
method_name, ext.name, sys.exc_info()[1])
......@@ -244,8 +243,7 @@ class VarianterDispatcher(Dispatcher):
raise
except: # catch any exception pylint: disable=W0702
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.debug')
log = logging.getLogger("avocado.app")
log.error('Error running method "%s" of plugin "%s": %s',
LOG_UI.error('Error running method "%s" of plugin "%s": %s',
method_name, ext.name, sys.exc_info()[1])
return ret
......
avocado/core/job.py
浏览文件 @ f2ca8094
......@@ -49,12 +49,12 @@ from ..utils import runtime
from ..utils import stacktrace
from ..utils import data_structures
from ..utils import process
from .output import LOG_JOB
from .output import LOG_UI
_NEW_ISSUE_LINK = 'https://github.com/avocado-framework/avocado/issues/new'
_TEST_LOGGER = logging.getLogger('avocado.test')
class Job(object):
......@@ -75,7 +75,7 @@ class Job(object):
args = argparse.Namespace()
self.args = args
self.references = getattr(args, "reference", [])
self.log = logging.getLogger("avocado.app")
self.log = LOG_UI
self.standalone = getattr(self.args, 'standalone', False)
if getattr(self.args, "dry_run", False): # Modify args for dry-run
if not self.args.unique_job_id:
......@@ -122,7 +122,7 @@ class Job(object):
self.__start_job_logging()
self.funcatexit = data_structures.CallbackRegister("JobExit %s"
% self.unique_id,
_TEST_LOGGER)
LOG_JOB)
self._stdout_stderr = None
self.replay_sourcejob = getattr(self.args, 'replay_sourcejob', None)
self.exitcode = exit_codes.AVOCADO_ALL_OK
......@@ -181,13 +181,13 @@ class Job(object):
# Enable test logger
fmt = ('%(asctime)s %(module)-16.16s L%(lineno)-.4d %('
'levelname)-5.5s| %(message)s')
test_handler = output.add_log_handler("avocado.test",
test_handler = output.add_log_handler(LOG_JOB,
logging.FileHandler,
self.logfile, self.loglevel, fmt)
root_logger = logging.getLogger()
root_logger.addHandler(test_handler)
root_logger.setLevel(self.loglevel)
self.__logging_handlers[test_handler] = ["avocado.test", ""]
self.__logging_handlers[test_handler] = [LOG_JOB.name, ""]
# Add --store-logging-streams
fmt = '%(asctime)s %(levelname)-5.5s| %(message)s'
formatter = logging.Formatter(fmt=fmt, datefmt='%H:%M:%S')
......@@ -218,13 +218,13 @@ class Job(object):
# Enable std{out,err} but redirect booth to stderr
sys.stdout = STD_OUTPUT.stdout
sys.stderr = STD_OUTPUT.stdout
test_handler = output.add_log_handler("avocado.test",
test_handler = output.add_log_handler(LOG_JOB,
logging.StreamHandler,
STD_OUTPUT.stdout,
logging.DEBUG,
fmt="%(message)s")
root_logger.addHandler(test_handler)
self.__logging_handlers[test_handler] = ["avocado.test", ""]
self.__logging_handlers[test_handler] = [LOG_JOB.name, ""]
def __stop_job_logging(self):
if self._stdout_stderr:
......@@ -239,8 +239,7 @@ class Job(object):
"""
def soft_abort(msg):
""" Only log the problem """
logging.getLogger("avocado.test").warning("Unable to update the "
"latest link: %s" % msg)
LOG_JOB.warning("Unable to update the latest link: %s" % msg)
basedir = os.path.dirname(self.logdir)
basename = os.path.basename(self.logdir)
proc_latest = os.path.join(basedir, "latest.%s" % os.getpid())
......@@ -310,23 +309,20 @@ class Job(object):
return suite
def _log_job_id(self):
job_log = _TEST_LOGGER
job_log.info('Job ID: %s', self.unique_id)
LOG_JOB.info('Job ID: %s', self.unique_id)
if self.replay_sourcejob is not None:
job_log.info('Replay of Job ID: %s', self.replay_sourcejob)
job_log.info('')
LOG_JOB.info('Replay of Job ID: %s', self.replay_sourcejob)
LOG_JOB.info('')
@staticmethod
def _log_cmdline():
job_log = _TEST_LOGGER
cmdline = " ".join(sys.argv)
job_log.info("Command line: %s", cmdline)
job_log.info('')
LOG_JOB.info("Command line: %s", cmdline)
LOG_JOB.info('')
@staticmethod
def _log_avocado_version():
job_log = _TEST_LOGGER
job_log.info('Avocado version: %s', version.VERSION)
LOG_JOB.info('Avocado version: %s', version.VERSION)
if os.path.exists('.git') and os.path.exists('avocado.spec'):
cmd = "git show --summary --pretty='%H'"
result = process.run(cmd, ignore_status=True)
......@@ -339,24 +335,23 @@ class Job(object):
# Let's display information only if git is installed
# (commands succeed).
if status == 0 and status2 == 0:
job_log.info('Avocado git repo info')
job_log.info("Top commit: %s", top_commit)
job_log.info("Branch: %s", branch)
job_log.info('')
LOG_JOB.info('Avocado git repo info')
LOG_JOB.info("Top commit: %s", top_commit)
LOG_JOB.info("Branch: %s", branch)
LOG_JOB.info('')
@staticmethod
def _log_avocado_config():
job_log = _TEST_LOGGER
job_log.info('Config files read (in order):')
LOG_JOB.info('Config files read (in order):')
for cfg_path in settings.config_paths:
job_log.info(cfg_path)
LOG_JOB.info(cfg_path)
if settings.config_paths_failed:
job_log.info('Config files failed to read (in order):')
LOG_JOB.info('Config files failed to read (in order):')
for cfg_path in settings.config_paths_failed:
job_log.info(cfg_path)
job_log.info('')
LOG_JOB.info(cfg_path)
LOG_JOB.info('')
job_log.info('Avocado config:')
LOG_JOB.info('Avocado config:')
header = ('Section.Key', 'Value')
config_matrix = []
for section in settings.config.sections():
......@@ -365,28 +360,26 @@ class Job(object):
config_matrix.append([config_key, value[1]])
for line in astring.iter_tabular_output(config_matrix, header):
job_log.info(line)
job_log.info('')
LOG_JOB.info(line)
LOG_JOB.info('')
def _log_avocado_datadir(self):
job_log = _TEST_LOGGER
job_log.info('Avocado Data Directories:')
job_log.info('')
job_log.info('base ' + data_dir.get_base_dir())
job_log.info('tests ' + data_dir.get_test_dir())
job_log.info('data ' + data_dir.get_data_dir())
job_log.info('logs ' + self.logdir)
job_log.info('')
LOG_JOB.info('Avocado Data Directories:')
LOG_JOB.info('')
LOG_JOB.info('base ' + data_dir.get_base_dir())
LOG_JOB.info('tests ' + data_dir.get_test_dir())
LOG_JOB.info('data ' + data_dir.get_data_dir())
LOG_JOB.info('logs ' + self.logdir)
LOG_JOB.info('')
def _log_variants(self, variants):
lines = variants.to_str(summary=1, variants=1, use_utf8=False)
for line in lines.splitlines():
_TEST_LOGGER.info(line)
LOG_JOB.info(line)
def _log_tmp_dir(self):
job_log = _TEST_LOGGER
job_log.info('Temporary dir: %s', data_dir.get_tmp_dir())
job_log.info('')
LOG_JOB.info('Temporary dir: %s', data_dir.get_tmp_dir())
LOG_JOB.info('')
def _log_job_debug_info(self, mux):
"""
......@@ -410,7 +403,7 @@ class Job(object):
self.test_suite = self._make_test_suite(self.references)
self.result.tests_total = len(self.test_suite)
except loader.LoaderError as details:
stacktrace.log_exc_info(sys.exc_info(), 'avocado.app.debug')
stacktrace.log_exc_info(sys.exc_info(), LOG_UI.getChild("debug"))
raise exceptions.OptionValidationError(details)
if not self.test_suite:
......@@ -458,7 +451,7 @@ class Job(object):
# If it's all good so far, set job status to 'PASS'
if self.status == 'RUNNING':
self.status = 'PASS'
_TEST_LOGGER.info('Test results available in %s', self.logdir)
LOG_JOB.info('Test results available in %s', self.logdir)
if summary is None:
self.exitcode |= exit_codes.AVOCADO_JOB_FAIL
......
avocado/core/loader.py
浏览文件 @ f2ca8094
......@@ -33,6 +33,7 @@ from . import safeloader
from ..utils import path
from ..utils import stacktrace
from .settings import settings
from .output import LOG_UI
#: Show default tests (for execution)
DEFAULT = False
......@@ -246,9 +247,9 @@ class TestLoaderProxy(object):
# FIXME: Introduce avocado.exceptions logger and use here
stacktrace.log_message("Test discovery plugin %s failed: "
"%s" % (plugin, details),
'avocado.app.exceptions')
LOG_UI.getChild("exceptions"))
# FIXME: Introduce avocado.traceback logger and use here
stacktrace.log_exc_info(sys.exc_info(), 'avocado.app.debug')
stacktrace.log_exc_info(sys.exc_info(), LOG_UI.getChild("debug"))
tests = []
unhandled_references = []
if not references:
......
avocado/core/output.py
浏览文件 @ f2ca8094
......@@ -348,11 +348,11 @@ def early_start():
Replace all outputs with in-memory handlers
"""
if os.environ.get('AVOCADO_LOG_DEBUG'):
add_log_handler("avocado.app.debug", logging.StreamHandler, sys.stdout,
logging.DEBUG)
add_log_handler(LOG_UI.getChild("debug"), logging.StreamHandler,
sys.stdout, logging.DEBUG)
if os.environ.get('AVOCADO_LOG_EARLY'):
add_log_handler("", logging.StreamHandler, sys.stdout, logging.DEBUG)
add_log_handler("avocado.test", logging.StreamHandler, sys.stdout,
add_log_handler(LOG_JOB, logging.StreamHandler, sys.stdout,
logging.DEBUG)
else:
STD_OUTPUT.fake_outputs()
......@@ -392,34 +392,33 @@ def reconfigure(args):
else:
STD_OUTPUT.enable_stderr()
STD_OUTPUT.print_records()
app_logger = logging.getLogger("avocado.app")
if "app" in enabled:
app_handler = ProgressStreamHandler()
app_handler.setFormatter(logging.Formatter("%(message)s"))
app_handler.addFilter(FilterInfoAndLess())
app_handler.stream = STD_OUTPUT.stdout
app_logger.addHandler(app_handler)
app_logger.propagate = False
app_logger.level = logging.DEBUG
LOG_UI.addHandler(app_handler)
LOG_UI.propagate = False
LOG_UI.level = logging.DEBUG
else:
disable_log_handler("avocado.app")
disable_log_handler(LOG_UI)
app_err_handler = ProgressStreamHandler()
app_err_handler.setFormatter(logging.Formatter("%(message)s"))
app_err_handler.addFilter(FilterWarnAndMore())
app_err_handler.stream = STD_OUTPUT.stderr
app_logger.addHandler(app_err_handler)
app_logger.propagate = False
LOG_UI.addHandler(app_err_handler)
LOG_UI.propagate = False
if not os.environ.get("AVOCADO_LOG_EARLY"):
logging.getLogger("avocado.test.stdout").propagate = False
logging.getLogger("avocado.test.stderr").propagate = False
LOG_JOB.getChild("stdout").propagate = False
LOG_JOB.getChild("stderr").propagate = False
if "early" in enabled:
add_log_handler("", logging.StreamHandler, STD_OUTPUT.stdout,
logging.DEBUG)
add_log_handler("avocado.test", logging.StreamHandler,
add_log_handler(LOG_JOB, logging.StreamHandler,
STD_OUTPUT.stdout, logging.DEBUG)
else:
disable_log_handler("")
disable_log_handler("avocado.test")
disable_log_handler(LOG_JOB)
if "remote" in enabled:
add_log_handler("avocado.fabric", stream=STD_OUTPUT.stdout,
level=logging.DEBUG)
......@@ -431,9 +430,9 @@ def reconfigure(args):
# Not enabled by env
if not os.environ.get('AVOCADO_LOG_DEBUG'):
if "debug" in enabled:
add_log_handler("avocado.app.debug", stream=STD_OUTPUT.stdout)
add_log_handler(LOG_UI.getChild("debug"), stream=STD_OUTPUT.stdout)
else:
disable_log_handler("avocado.app.debug")
disable_log_handler(LOG_UI.getChild("debug"))
# Add custom loggers
for name in [_ for _ in enabled if _ not in BUILTIN_STREAMS.iterkeys()]:
......@@ -448,7 +447,7 @@ def reconfigure(args):
add_log_handler(name, logging.StreamHandler, STD_OUTPUT.stdout,
level)
except ValueError as details:
app_logger.error("Failed to set logger for --show %s:%s: %s.",
LOG_UI.error("Failed to set logger for --show %s:%s: %s.",
name, level, details)
sys.exit(exit_codes.AVOCADO_FAIL)
# Remove the in-memory handlers
......@@ -576,17 +575,20 @@ def add_log_handler(logger, klass=logging.StreamHandler, stream=sys.stdout,
:param level: Log level (defaults to `INFO``)
:param fmt: Logging format (defaults to ``%(name)s: %(message)s``)
"""
if isinstance(logger, basestring):
logger = logging.getLogger(logger)
handler = klass(stream)
handler.setLevel(level)
if isinstance(fmt, str):
fmt = logging.Formatter(fmt=fmt)
handler.setFormatter(fmt)
logging.getLogger(logger).addHandler(handler)
logging.getLogger(logger).propagate = False
logger.addHandler(handler)
logger.propagate = False
return handler
def disable_log_handler(logger):
if isinstance(logger, basestring):
logger = logging.getLogger(logger)
# Handlers might be reused elsewhere, can't delete them
while logger.handlers:
......@@ -704,7 +706,6 @@ def log_plugin_failures(failures):
:class:`avocado.core.dispatcher.Dispatcher`
attribute `load_failures`
"""
log = logging.getLogger("avocado.app")
msg_fmt = 'Failed to load plugin from module "%s": %s'
silenced = settings.get_value('plugins',
'skip_broken_plugin_notification',
......@@ -712,5 +713,5 @@ def log_plugin_failures(failures):
for failure in failures:
if failure[0].module_name in silenced:
continue
log.error(msg_fmt, failure[0].module_name,
LOG_UI.error(msg_fmt, failure[0].module_name,
failure[1].__repr__())
avocado/core/parser.py
浏览文件 @ f2ca8094
......@@ -17,13 +17,12 @@ Avocado application command line parsing.
"""
import argparse
import logging
from . import exit_codes
from . import varianter
from . import settings
from . import tree
from .output import BUILTIN_STREAMS, BUILTIN_STREAM_SETS
from .output import BUILTIN_STREAMS, BUILTIN_STREAM_SETS, LOG_UI
from .version import VERSION
PROG = 'avocado'
......@@ -37,9 +36,8 @@ class ArgumentParser(argparse.ArgumentParser):
"""
def error(self, message):
log = logging.getLogger("avocado.app")
log.debug(self.format_help())
log.error("%s: error: %s", self.prog, message)
LOG_UI.debug(self.format_help())
LOG_UI.error("%s: error: %s", self.prog, message)
self.exit(exit_codes.AVOCADO_FAIL)
def _get_option_tuples(self, option_string):
......
avocado/core/restclient/cli/actions/server.py
浏览文件 @ f2ca8094
......@@ -6,13 +6,9 @@ Module that implements the actions for the CLI App when the job toplevel
command is used
"""
import logging
from . import base
from ... import connection
log = logging.getLogger("avocado.app")
from ....output import LOG_UI
@base.action
......@@ -21,7 +17,7 @@ def status(app):
Shows the server status
"""
data = app.connection.request("version/")
log.info("Server version: %s", data.get('version'))
LOG_UI.info("Server version: %s", data.get('version'))
@base.action
......@@ -33,9 +29,9 @@ def list_brief(app):
data = app.connection.get_api_list()
except connection.UnexpectedHttpStatusCode as e:
if e.received == 403:
log.error("Error: Access Forbidden")
LOG_UI.error("Error: Access Forbidden")
return False
log.info("Available APIs:")
LOG_UI.info("Available APIs:")
for name in data:
log.info(" * %s", name)
LOG_UI.info(" * %s", name)
avocado/core/restclient/cli/app.py
浏览文件 @ f2ca8094
......@@ -16,13 +16,13 @@ This is the main entry point for the rest client cli application
"""
import importlib
import logging
import sys
import types
from . import parser
from .. import connection
from ... import exit_codes
from ...output import LOG_UI
__all__ = ['App']
......@@ -48,7 +48,7 @@ class App(object):
self.connection = None
self.parser = parser.Parser()
self.parser.add_arguments_on_all_modules()
self.log = logging.getLogger("avocado.app")
self.log = LOG_UI
def initialize_connection(self):
"""
......
avocado/core/runner.py
浏览文件 @ f2ca8094
......@@ -36,8 +36,8 @@ from ..utils import runtime
from ..utils import process
from ..utils import stacktrace
TEST_LOG = logging.getLogger("avocado.test")
APP_LOG = logging.getLogger("avocado.app")
from .output import LOG_UI as APP_LOG
from .output import LOG_JOB as TEST_LOG
#: when test was interrupted (ctrl+c/timeout)
TIMEOUT_TEST_INTERRUPTED = 1
......
avocado/core/test.py
浏览文件 @ f2ca8094
......@@ -43,6 +43,7 @@ from ..utils import stacktrace
from .decorators import skip
from .settings import settings
from .version import VERSION
from .output import LOG_JOB
#: Environment variable used to store the location of a temporary
......@@ -216,7 +217,7 @@ class Test(unittest.TestCase):
self.__sysinfodir = utils_path.init_dir(self.logdir, 'sysinfo')
self.__sysinfo_logger = sysinfo.SysInfo(basedir=self.__sysinfodir)
self.__log = logging.getLogger("avocado.test")
self.__log = LOG_JOB
original_log_warn = self.log.warning
self.__log_warn_used = False
self.log.warn = self.log.warning = record_and_warn
......@@ -491,12 +492,13 @@ class Test(unittest.TestCase):
stream_fmt = '%(message)s'
stream_formatter = logging.Formatter(fmt=stream_fmt)
self._register_log_file_handler(
logging.getLogger("avocado.test.stdout"),
log_test_stdout = LOG_JOB.getChild("stdout")
log_test_stderr = LOG_JOB.getChild("stderr")
self._register_log_file_handler(log_test_stdout,
stream_formatter,
self._stdout_file)
self._register_log_file_handler(
logging.getLogger("avocado.test.stderr"),
self._register_log_file_handler(log_test_stderr,
stream_formatter,
self._stderr_file)
self._register_log_file_handler(logging.getLogger('paramiko'),
......@@ -504,9 +506,9 @@ class Test(unittest.TestCase):
self._ssh_logfile)
if isinstance(sys.stdout, output.LoggingFile):
sys.stdout.add_logger(logging.getLogger("avocado.test.stdout"))
sys.stdout.add_logger(log_test_stdout)
if isinstance(sys.stderr, output.LoggingFile):
sys.stderr.add_logger(logging.getLogger("avocado.test.stderr"))
sys.stderr.add_logger(log_test_stderr)
def _stop_logging(self):
"""
......@@ -514,9 +516,9 @@ class Test(unittest.TestCase):
"""
self.log.removeHandler(self.file_handler)
if isinstance(sys.stderr, output.LoggingFile):
sys.stderr.rm_logger(logging.getLogger("avocado.test.stderr"))
sys.stderr.rm_logger(LOG_JOB.getChild("stderr"))
if isinstance(sys.stdout, output.LoggingFile):
sys.stdout.rm_logger(logging.getLogger("avocado.test.stdout"))
sys.stdout.rm_logger(LOG_JOB.getChild("stdout"))
for name, handler in self._logging_handlers.iteritems():
logging.getLogger(name).removeHandler(handler)
......@@ -566,12 +568,12 @@ class Test(unittest.TestCase):
if skip_test is False:
self.setUp()
except (exceptions.TestSetupSkip, exceptions.TestSkipError) as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise exceptions.TestSkipError(details)
except exceptions.TestCancel as details:
cancel_test = details
except: # Old-style exceptions are not inherited from Exception()
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
details = sys.exc_info()[1]
raise exceptions.TestSetupFail(details)
try:
......@@ -580,20 +582,20 @@ class Test(unittest.TestCase):
testMethod()
except exceptions.TestSetupSkip as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
skip_illegal_msg = ('Calling skip() in places other than '
'setUp() is not allowed in avocado, you '
'must fix your test. Original skip exception: '
'%s' % details)
raise exceptions.TestError(skip_illegal_msg)
except exceptions.TestSkipError as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise
except exceptions.TestCancel as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise
except: # Old-style exceptions are not inherited from Exception()
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
details = sys.exc_info()[1]
if not isinstance(details, Exception): # Avoid passing nasty exc
details = exceptions.TestError("%r: %s" % (details, details))
......@@ -607,14 +609,14 @@ class Test(unittest.TestCase):
if skip_test is False:
self.tearDown()
except exceptions.TestSetupSkip as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
skip_illegal_msg = ('Calling skip() in places other than '
'setUp() is not allowed in avocado, '
'you must fix your test. Original skip '
'exception: %s' % details)
raise exceptions.TestError(skip_illegal_msg)
except exceptions.TestSkipError as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
skip_illegal_msg = ('Using skip decorators in tearDown() '
'is not allowed in '
'avocado, you must fix your '
......@@ -622,10 +624,10 @@ class Test(unittest.TestCase):
details)
raise exceptions.TestError(skip_illegal_msg)
except exceptions.TestCancel as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise
except: # avoid old-style exception failures
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
details = sys.exc_info()[1]
cleanup_exception = exceptions.TestSetupFail(details)
......@@ -648,13 +650,13 @@ class Test(unittest.TestCase):
self._check_reference_stdout()
except Exception as details:
stacktrace.log_exc_info(sys.exc_info(),
logger='avocado.test')
logger=LOG_JOB)
stdout_check_exception = details
try:
self._check_reference_stderr()
except Exception as details:
stacktrace.log_exc_info(sys.exc_info(),
logger='avocado.test')
logger=LOG_JOB)
stderr_check_exception = details
elif not job_standalone:
if output_check_record in ['all', 'stdout']:
......
avocado/core/varianter.py
浏览文件 @ f2ca8094
......@@ -19,11 +19,11 @@
Multiplex and create variants.
"""
import logging
import re
from . import tree
from . import dispatcher
from .output import LOG_JOB
# TODO: Create multiplexer plugin and split these functions into multiple files
......@@ -45,7 +45,7 @@ class AvocadoParams(object):
of duplicate entries inherited from ancestor nodes. It shouldn't produce
false values, though.
In this version each new "get()" call is logged into "avocado.test" log.
In this version each new "get()" call is logged into avocado.LOG_JOB.
This is subject of change (separate file, perhaps)
"""
......@@ -70,7 +70,6 @@ class AvocadoParams(object):
path_leaves = self._get_matching_leaves('/*', leaves)
self._abs_path = AvocadoParam(path_leaves, '*: *')
self.id = test_id
self._log = logging.getLogger("avocado.test").debug
self._cache = {} # TODO: Implement something more efficient
# TODO: Get rid of this and prepare something better
self._default_params = default_params
......@@ -89,13 +88,11 @@ class AvocadoParams(object):
def __getstate__(self):
""" log can't be pickled """
copy = self.__dict__.copy()
del(copy['_log'])
return copy
def __setstate__(self, orig):
""" refresh log """
self.__dict__.update(orig)
self._log = logging.getLogger("avocado.test").debug
def __repr__(self):
return "<AvocadoParams %s>" % self._str()
......@@ -112,7 +109,7 @@ class AvocadoParams(object):
def log(self, key, path, default, value):
""" Predefined format for displaying params query """
self._log("PARAMS (key=%s, path=%s, default=%s) => %r", key, path,
LOG_JOB.debug("PARAMS (key=%s, path=%s, default=%s) => %r", key, path,
default, value)
def _get_matching_leaves(self, path, leaves):
......@@ -169,7 +166,7 @@ class AvocadoParams(object):
msg = ("You're probably retrieving param %s via attributes "
" (self.params.$key) which is obsoleted. Use "
"self.params.get($key) instead." % attr)
logging.getLogger("avocado.test").warn(msg)
LOG_JOB.warn(msg)
return self.get(attr)
def get(self, key, path=None, default=None):
......
avocado/plugins/config.py
浏览文件 @ f2ca8094
......@@ -12,9 +12,8 @@
# Copyright: Red Hat Inc. 2013-2014
# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
import logging
from avocado.core import data_dir
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.core.settings import settings
......@@ -38,15 +37,14 @@ class Config(CLICmd):
'Current: %(default)s')
def run(self, args):
log = logging.getLogger("avocado.app")
log.info('Config files read (in order):')
LOG_UI.info('Config files read (in order):')
for cfg_path in settings.config_paths:
log.debug(' %s' % cfg_path)
LOG_UI.debug(' %s' % cfg_path)
if settings.config_paths_failed:
log.error('\nConfig files that failed to read:')
LOG_UI.error('\nConfig files that failed to read:')
for cfg_path in settings.config_paths_failed:
log.error(' %s' % cfg_path)
log.debug("")
LOG_UI.error(' %s' % cfg_path)
LOG_UI.debug("")
if not args.datadir:
blength = 0
for section in settings.config.sections():
......@@ -57,18 +55,18 @@ class Config(CLICmd):
format_str = " %-" + str(blength) + "s %s"
log.debug(format_str, 'Section.Key', 'Value')
LOG_UI.debug(format_str, 'Section.Key', 'Value')
for section in settings.config.sections():
for value in settings.config.items(section):
config_key = ".".join((section, value[0]))
log.debug(format_str, config_key, value[1])
LOG_UI.debug(format_str, config_key, value[1])
else:
log.debug("Avocado replaces config dirs that can't be accessed")
log.debug("with sensible defaults. Please edit your local config")
log.debug("file to customize values")
log.debug('')
log.info('Avocado Data Directories:')
log.debug(' base ' + data_dir.get_base_dir())
log.debug(' tests ' + data_dir.get_test_dir())
log.debug(' data ' + data_dir.get_data_dir())
log.debug(' logs ' + data_dir.get_logs_dir())
LOG_UI.debug("Avocado replaces config dirs that can't be accessed")
LOG_UI.debug("with sensible defaults. Please edit your local config")
LOG_UI.debug("file to customize values")
LOG_UI.debug('')
LOG_UI.info('Avocado Data Directories:')
LOG_UI.debug(' base ' + data_dir.get_base_dir())
LOG_UI.debug(' tests ' + data_dir.get_test_dir())
LOG_UI.debug(' data ' + data_dir.get_data_dir())
LOG_UI.debug(' logs ' + data_dir.get_logs_dir())
avocado/plugins/diff.py
浏览文件 @ f2ca8094
......@@ -19,7 +19,6 @@ Job Diff
from __future__ import absolute_import
import argparse
import json
import logging
import os
import subprocess
import sys
......@@ -31,13 +30,11 @@ from avocado.core import exit_codes
from avocado.core import jobdata
from avocado.core import output
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.core.settings import settings
LOG = logging.getLogger("avocado.app")
class Diff(CLICmd):
"""
......@@ -217,7 +214,7 @@ class Diff(CLICmd):
tmp_file2.writelines(job2_results)
tmp_file2.close()
LOG.info('%s %s', tmp_file1.name, tmp_file2.name)
LOG_UI.info('%s %s', tmp_file1.name, tmp_file2.name)
if (getattr(args, 'open_browser', False) and
getattr(args, 'html', None) is None):
......@@ -259,10 +256,10 @@ class Diff(CLICmd):
with open(args.html, 'w') as html_file:
html_file.writelines(job_diff_html.encode("utf-8"))
LOG.info(args.html)
LOG_UI.info(args.html)
except IOError as exception:
LOG.error(exception)
LOG_UI.error(exception)
sys.exit(exit_codes.AVOCADO_FAIL)
if getattr(args, 'open_browser', False):
......@@ -281,13 +278,13 @@ class Diff(CLICmd):
job2_results,
fromfile=job1_id,
tofile=job2_id)):
LOG.debug(line.strip())
LOG_UI.debug(line.strip())
else:
for line in unified_diff(job1_results,
job2_results,
fromfile=job1_id,
tofile=job2_id):
LOG.debug(line.strip())
LOG_UI.debug(line.strip())
@staticmethod
def _validate_filters(string):
......@@ -342,17 +339,17 @@ class Diff(CLICmd):
try:
resultsdir = jobdata.get_resultsdir(logdir, job_id)
except ValueError as exception:
LOG.error(exception.message)
LOG_UI.error(exception.message)
sys.exit(exit_codes.AVOCADO_FAIL)
if resultsdir is None:
LOG.error("Can't find job results directory for '%s' in '%s'",
LOG_UI.error("Can't find job results directory for '%s' in '%s'",
job_id, logdir)
sys.exit(exit_codes.AVOCADO_FAIL)
sourcejob = jobdata.get_id(os.path.join(resultsdir, 'id'), job_id)
if sourcejob is None:
LOG.error("Can't find matching job id '%s' in '%s' directory.",
LOG_UI.error("Can't find matching job id '%s' in '%s' directory.",
job_id, resultsdir)
sys.exit(exit_codes.AVOCADO_FAIL)
......
avocado/plugins/distro.py
浏览文件 @ f2ca8094
......@@ -14,12 +14,12 @@
import bz2
import json
import logging
import os
import sys
from avocado.core import exit_codes
from avocado.core.plugin_interfaces import CLICmd
from avocado.core.output import LOG_UI
from avocado.utils import distro as utils_distro
from avocado.utils import path as utils_path
from avocado.utils import process
......@@ -340,12 +340,11 @@ class Distro(CLICmd):
args.distro_def_arch)
def run(self, args):
log = logging.getLogger("avocado.app")
if args.distro_def_create:
if not (args.distro_def_name and args.distro_def_version and
args.distro_def_arch and args.distro_def_type and
args.distro_def_path):
log.error('Required arguments: name, version, arch, type '
LOG_UI.error('Required arguments: name, version, arch, type '
'and path')
sys.exit(exit_codes.AVOCADO_FAIL)
......@@ -353,9 +352,9 @@ class Distro(CLICmd):
if os.path.exists(output_file_name):
error_msg = ('Output file "%s" already exists, will not '
'overwrite it', output_file_name)
log.error(error_msg)
LOG_UI.error(error_msg)
else:
log.debug("Loading distro information from tree... "
LOG_UI.debug("Loading distro information from tree... "
"Please wait...")
distro = load_from_tree(args.distro_def_name,
args.distro_def_version,
......@@ -364,10 +363,10 @@ class Distro(CLICmd):
args.distro_def_type,
args.distro_def_path)
save_distro(distro, output_file_name)
log.debug('Distro information saved to "%s"',
LOG_UI.debug('Distro information saved to "%s"',
output_file_name)
else:
detected = utils_distro.detect()
log.debug('Detected distribution: %s (%s) version %s release %s',
detected.name, detected.arch, detected.version,
LOG_UI.debug('Detected distribution: %s (%s) version %s release '
'%s', detected.name, detected.arch, detected.version,
detected.release)
avocado/plugins/exec_path.py
浏览文件 @ f2ca8094
......@@ -14,11 +14,11 @@
Libexec PATHs modifier
"""
import logging
import os
import sys
from avocado.core import exit_codes
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
......@@ -37,21 +37,20 @@ class ExecPath(CLICmd):
:param args: Command line args received from the run subparser.
"""
log = logging.getLogger("avocado.app")
if 'VIRTUAL_ENV' in os.environ:
log.debug('libexec')
LOG_UI.debug('libexec')
elif os.path.exists('/usr/libexec/avocado'):
log.debug('/usr/libexec/avocado')
LOG_UI.debug('/usr/libexec/avocado')
elif os.path.exists('/usr/lib/avocado'):
log.debug('/usr/lib/avocado')
LOG_UI.debug('/usr/lib/avocado')
else:
for path in os.environ.get('PATH').split(':'):
if (os.path.exists(os.path.join(path, 'avocado')) and
os.path.exists(os.path.join(os.path.dirname(path),
'libexec'))):
log.debug(os.path.join(os.path.dirname(path), 'libexec'))
LOG_UI.debug(os.path.join(os.path.dirname(path), 'libexec'))
break
else:
log.error("Can't locate avocado libexec path")
LOG_UI.error("Can't locate avocado libexec path")
sys.exit(exit_codes.AVOCADO_FAIL)
return sys.exit(exit_codes.AVOCADO_ALL_OK)
avocado/plugins/human.py
浏览文件 @ f2ca8094
......@@ -15,8 +15,7 @@
Human result UI
"""
import logging
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import ResultEvents
from avocado.core.plugin_interfaces import JobPre, JobPost
from avocado.core import output
......@@ -40,7 +39,6 @@ class Human(ResultEvents):
'CANCEL': output.TERM_SUPPORT.CANCEL}
def __init__(self, args):
self.log = logging.getLogger("avocado.app")
self.__throbber = output.Throbber()
stdout_claimed_by = getattr(args, 'stdout_claimed_by', None)
self.owns_stdout = not stdout_claimed_by
......@@ -48,11 +46,11 @@ class Human(ResultEvents):
def pre_tests(self, job):
if not self.owns_stdout:
return
self.log.info("JOB ID : %s", job.unique_id)
LOG_UI.info("JOB ID : %s", job.unique_id)
replay_source_job = getattr(job.args, "replay_sourcejob", False)
if replay_source_job:
self.log.info("SRC JOB ID : %s", replay_source_job)
self.log.info("JOB LOG : %s", job.logfile)
LOG_UI.info("SRC JOB ID : %s", replay_source_job)
LOG_UI.info("JOB LOG : %s", job.logfile)
def start_test(self, result, state):
if not self.owns_stdout:
......@@ -64,7 +62,7 @@ class Human(ResultEvents):
else:
name = "<unknown>"
uid = '?'
self.log.debug(' (%s/%s) %s: ', uid, result.tests_total, name,
LOG_UI.debug(' (%s/%s) %s: ', uid, result.tests_total, name,
extra={"skip_newline": True})
def test_progress(self, progress=False):
......@@ -74,7 +72,7 @@ class Human(ResultEvents):
color = output.TERM_SUPPORT.PASS
else:
color = output.TERM_SUPPORT.PARTIAL
self.log.debug(color + self.__throbber.render() +
LOG_UI.debug(color + self.__throbber.render() +
output.TERM_SUPPORT.ENDC, extra={"skip_newline": True})
def end_test(self, result, state):
......@@ -86,7 +84,7 @@ class Human(ResultEvents):
duration = (" (%.2f s)" % state.get('time_elapsed', -1)
if status != "SKIP"
else "")
self.log.debug(output.TERM_SUPPORT.MOVE_BACK +
LOG_UI.debug(output.TERM_SUPPORT.MOVE_BACK +
self.output_mapping[status] +
status + output.TERM_SUPPORT.ENDC +
duration)
......@@ -94,7 +92,7 @@ class Human(ResultEvents):
def post_tests(self, job):
if not self.owns_stdout:
return
self.log.info("RESULTS : PASS %d | ERROR %d | FAIL %d | SKIP %d | "
LOG_UI.info("RESULTS : PASS %d | ERROR %d | FAIL %d | SKIP %d | "
"WARN %d | INTERRUPT %s | CANCEL %s", job.result.passed,
job.result.errors, job.result.failed, job.result.skipped,
job.result.warned, job.result.interrupted,
......@@ -116,5 +114,4 @@ class HumanJob(JobPre, JobPost):
def post(self, job):
if job.time_elapsed != -1:
if not getattr(job.args, 'stdout_claimed_by', None):
log = logging.getLogger("avocado.app")
log.info("JOB TIME : %.2f s", job.time_elapsed)
LOG_UI.info("JOB TIME : %.2f s", job.time_elapsed)
avocado/plugins/jobscripts.py
浏览文件 @ f2ca8094
import os
import logging
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import JobPre, JobPost
from avocado.core.settings import settings
from avocado.utils import process
......@@ -15,7 +15,6 @@ class JobScripts(JobPre, JobPost):
description = 'Runs scripts before/after the job is run'
def __init__(self):
self.log = logging.getLogger("avocado.app")
self.warn_non_existing_dir = settings.get_value(section=CONFIG_SECTION,
key="warn_non_existing_dir",
key_type=bool,
......@@ -28,7 +27,7 @@ class JobScripts(JobPre, JobPost):
def _run_scripts(self, kind, scripts_dir, job):
if not os.path.isdir(scripts_dir):
if self.warn_non_existing_dir:
self.log.error("Directory configured to hold %s-job scripts "
LOG_UI.error("Directory configured to hold %s-job scripts "
"has not been found: %s", kind, scripts_dir)
return
......@@ -44,7 +43,7 @@ class JobScripts(JobPre, JobPost):
for script in scripts:
result = process.run(script, ignore_status=True, env=env)
if (result.exit_status != 0) and self.warn_non_zero_status:
self.log.error('%s job script "%s" exited with status "%i"',
LOG_UI.error('%s job script "%s" exited with status "%i"',
kind.capitalize(), script, result.exit_status)
@staticmethod
......
avocado/plugins/jsonresult.py
浏览文件 @ f2ca8094
......@@ -18,9 +18,9 @@ JSON output module.
"""
import json
import logging
import os
from avocado.core.output import LOG_UI
from avocado.core.parser import FileOrStdoutAction
from avocado.core.plugin_interfaces import CLI, Result
......@@ -86,8 +86,7 @@ class JSONResult(Result):
json_path = getattr(job.args, 'json_output', 'None')
if json_path is not None:
if json_path == '-':
log = logging.getLogger("avocado.app")
log.debug(content)
LOG_UI.debug(content)
else:
with open(json_path, 'w') as json_file:
json_file.write(content)
......
avocado/plugins/list.py
浏览文件 @ f2ca8094
......@@ -12,13 +12,13 @@
# Copyright: Red Hat Inc. 2013-2014
# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
import logging
import sys
from avocado.core import exit_codes, output
from avocado.core import loader
from avocado.core import test
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.utils import astring
......@@ -30,7 +30,6 @@ class TestLister(object):
"""
def __init__(self, args):
self.log = logging.getLogger("avocado.app")
try:
loader.loader.load_plugins(args)
except loader.LoaderError as details:
......@@ -48,7 +47,7 @@ class TestLister(object):
return loader.loader.discover(paths,
which_tests=which_tests)
except loader.LoaderUnhandledReferenceError as details:
self.log.error(str(details))
LOG_UI.error(str(details))
sys.exit(exit_codes.AVOCADO_FAIL)
def _get_test_matrix(self, test_suite):
......@@ -90,12 +89,12 @@ class TestLister(object):
output.TERM_SUPPORT.header_str('Test'))
for line in astring.iter_tabular_output(test_matrix, header=header):
self.log.debug(line)
LOG_UI.debug(line)
if self.args.verbose:
self.log.debug("")
LOG_UI.debug("")
for key in sorted(stats):
self.log.info("%s: %s", key.upper(), stats[key])
LOG_UI.info("%s: %s", key.upper(), stats[key])
def _list(self):
self._extra_listing()
......@@ -112,7 +111,7 @@ class TestLister(object):
try:
self._list()
except KeyboardInterrupt:
self.log.error('Command interrupted by user...')
LOG_UI.error('Command interrupted by user...')
return exit_codes.AVOCADO_FAIL
......
avocado/plugins/multiplex.py
浏览文件 @ f2ca8094
......@@ -12,7 +12,7 @@
# Copyright: Red Hat Inc. 2013-2014
# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
import logging
from avocado.core.output import LOG_UI
from .variants import Variants
......@@ -27,8 +27,7 @@ class Multiplex(Variants):
name = "multiplex"
def run(self, args):
log = logging.getLogger("avocado.app")
log.warning("The 'avocado multiplex' command is deprecated by the "
LOG_UI.warning("The 'avocado multiplex' command is deprecated by the "
"'avocado variants' one. Please start using that one "
"instead as this will be removed in Avocado 52.0.")
super(Multiplex, self).run(args)
avocado/plugins/plugins.py
浏览文件 @ f2ca8094
......@@ -15,9 +15,8 @@
Plugins information plugin
"""
import logging
from avocado.core import dispatcher
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.utils import astring
......@@ -39,7 +38,6 @@ class Plugins(CLICmd):
'Current: %(default)s')
def run(self, args):
log = logging.getLogger("avocado.app")
plugin_types = [
(dispatcher.CLICmdDispatcher(),
'Plugins that add new commands (cli.cmd):'),
......@@ -56,13 +54,13 @@ class Plugins(CLICmd):
'Plugins that generate test variants (varianter): ')
]
for plugins_active, msg in plugin_types:
log.info(msg)
LOG_UI.info(msg)
plugin_matrix = []
for plugin in sorted(plugins_active, key=lambda x: x.name):
plugin_matrix.append((plugin.name, plugin.obj.description))
if not plugin_matrix:
log.debug("(No active plugin)")
LOG_UI.debug("(No active plugin)")
else:
for line in astring.iter_tabular_output(plugin_matrix):
log.debug(line)
LOG_UI.debug(line)
avocado/plugins/replay.py
浏览文件 @ f2ca8094
......@@ -14,7 +14,6 @@
import argparse
import json
import logging
import os
import re
import sys
......@@ -23,6 +22,7 @@ from avocado.core import exit_codes
from avocado.core import jobdata
from avocado.core import status
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI
from avocado.core.settings import settings
from avocado.core.test import ReplaySkipTest
......@@ -165,8 +165,6 @@ class Replay(CLI):
if getattr(args, 'replay_jobid', None) is None:
return
log = logging.getLogger("avocado.app")
err = None
if args.replay_teststatus and 'variants' in args.replay_ignore:
err = ("Option `--replay-test-status` is incompatible with "
......@@ -177,7 +175,7 @@ class Replay(CLI):
elif args.remote_hostname:
err = "Currently we don't replay jobs in remote hosts."
if err is not None:
log.error(err)
LOG_UI.error(err)
sys.exit(exit_codes.AVOCADO_FAIL)
if getattr(args, 'logdir', None) is not None:
......@@ -189,11 +187,11 @@ class Replay(CLI):
try:
resultsdir = jobdata.get_resultsdir(logdir, args.replay_jobid)
except ValueError as exception:
log.error(exception.message)
LOG_UI.error(exception.message)
sys.exit(exit_codes.AVOCADO_FAIL)
if resultsdir is None:
log.error("Can't find job results directory in '%s'", logdir)
LOG_UI.error("Can't find job results directory in '%s'", logdir)
sys.exit(exit_codes.AVOCADO_FAIL)
sourcejob = jobdata.get_id(os.path.join(resultsdir, 'id'),
......@@ -201,7 +199,7 @@ class Replay(CLI):
if sourcejob is None:
msg = ("Can't find matching job id '%s' in '%s' directory."
% (args.replay_jobid, resultsdir))
log.error(msg)
LOG_UI.error(msg)
sys.exit(exit_codes.AVOCADO_FAIL)
setattr(args, 'replay_sourcejob', sourcejob)
......@@ -212,13 +210,14 @@ class Replay(CLI):
'external_runner_chdir',
'failfast']
if replay_args is None:
log.warn('Source job args data not found. These options will not '
'be loaded in this replay job: %s', ', '.join(whitelist))
LOG_UI.warn('Source job args data not found. These options will '
'not be loaded in this replay job: %s',
', '.join(whitelist))
else:
for option in whitelist:
optvalue = getattr(args, option, None)
if optvalue is not None:
log.warn("Overriding the replay %s with the --%s value "
LOG_UI.warn("Overriding the replay %s with the --%s value "
"given on the command line.",
option.replace('_', '-'),
option.replace('_', '-'))
......@@ -228,29 +227,30 @@ class Replay(CLI):
# Keeping this for compatibility.
# TODO: Use replay_args['reference'] at some point in the future.
if getattr(args, 'reference', None):
log.warn('Overriding the replay test references with test '
LOG_UI.warn('Overriding the replay test references with test '
'references given in the command line.')
else:
references = jobdata.retrieve_references(resultsdir)
if references is None:
log.error('Source job test references data not found. Aborting.')
LOG_UI.error('Source job test references data not found. '
'Aborting.')
sys.exit(exit_codes.AVOCADO_FAIL)
else:
setattr(args, 'reference', references)
if 'config' in args.replay_ignore:
log.warn("Ignoring configuration from source job with "
LOG_UI.warn("Ignoring configuration from source job with "
"--replay-ignore.")
else:
self.load_config(resultsdir)
if 'variants' in args.replay_ignore:
log.warn("Ignoring variants from source job with "
LOG_UI.warn("Ignoring variants from source job with "
"--replay-ignore.")
else:
variants = jobdata.retrieve_variants(resultsdir)
if variants is None:
log.error('Source job variants data not found. Aborting.')
LOG_UI.error('Source job variants data not found. Aborting.')
sys.exit(exit_codes.AVOCADO_FAIL)
else:
# Ignore data manipulation. This is necessary, because
......@@ -258,8 +258,9 @@ class Replay(CLI):
# are other plugins running before/after this which might
# want to alter the variants object.
if args.avocado_variants.is_parsed():
log.warning("Using src job Mux data only, use `--replay-"
"ignore variants` to override them.")
LOG_UI.warning("Using src job Mux data only, use "
"`--replay-ignore variants` to override "
"them.")
setattr(args, "avocado_variants", variants)
# Extend "replay_test_status" of "INTERRUPTED" when --replay-resume
......@@ -280,5 +281,5 @@ class Replay(CLI):
if os.path.exists(pwd):
os.chdir(pwd)
else:
log.warn("Directory used in the replay source job '%s' does "
"not exist, using '.' instead", pwd)
LOG_UI.warn("Directory used in the replay source job '%s' does"
" not exist, using '.' instead", pwd)
avocado/plugins/run.py
浏览文件 @ f2ca8094
......@@ -17,13 +17,13 @@ Base Test Runner Plugins.
"""
import argparse
import logging
import sys
from avocado.core import exit_codes
from avocado.core import job
from avocado.core import loader
from avocado.core import output
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.core.dispatcher import ResultDispatcher
from avocado.core.dispatcher import JobPrePostDispatcher
......@@ -153,21 +153,19 @@ class Run(CLICmd):
:param args: Command line args received from the run subparser.
"""
log = logging.getLogger("avocado.app")
if args.unique_job_id is not None:
try:
int(args.unique_job_id, 16)
if len(args.unique_job_id) != 40:
raise ValueError
except ValueError:
log.error('Unique Job ID needs to be a 40 digit hex number')
LOG_UI.error('Unique Job ID needs to be a 40 digit hex number')
sys.exit(exit_codes.AVOCADO_FAIL)
try:
args.job_timeout = time_to_seconds(args.job_timeout)
except ValueError as e:
log.error(e.message)
LOG_UI.error(e.message)
sys.exit(exit_codes.AVOCADO_FAIL)
job_instance = job.Job(args)
pre_post_dispatcher = JobPrePostDispatcher()
try:
......
avocado/plugins/tap.py
浏览文件 @ f2ca8094
......@@ -15,9 +15,9 @@
TAP output module.
"""
import logging
import os
from avocado.core.output import LOG_UI
from avocado.core.parser import FileOrStdoutAction
from avocado.core.plugin_interfaces import CLI, ResultEvents
......@@ -63,7 +63,7 @@ class TAPResult(ResultEvents):
self.__open_files = []
output = getattr(args, 'tap', None)
if output == '-':
log = logging.getLogger("avocado.app").debug
log = LOG_UI.debug
self.__logs.append(log)
elif output is not None:
log = open(output, "w", 1)
......
avocado/plugins/variants.py
浏览文件 @ f2ca8094
......@@ -13,10 +13,10 @@
# Author: Lucas Meneghel Rodrigues <lmr@redhat.com>
# Author: Lukas Doktor <ldoktor@redhat.com>
import logging
import sys
from avocado.core import exit_codes
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLICmd
from avocado.core.settings import settings
......@@ -79,20 +79,19 @@ class Variants(CLICmd):
"inherited values")
def run(self, args):
log = logging.getLogger("avocado.app")
err = None
if args.tree and args.mux_debug:
err = "Option --tree is incompatible with --debug."
elif not args.tree and args.inherit:
err = "Option --inherit can be only used with --tree"
if err:
log.error(err)
LOG_UI.error(err)
sys.exit(exit_codes.AVOCADO_FAIL)
varianter = args.avocado_variants
try:
varianter.parse(args)
except (IOError, ValueError) as details:
log.error("Unable to parse varianter: %s", details)
LOG_UI.error("Unable to parse varianter: %s", details)
sys.exit(exit_codes.AVOCADO_FAIL)
use_utf8 = settings.get_value("runner.output", "utf8",
key_type=bool, default=None)
......@@ -116,6 +115,6 @@ class Variants(CLICmd):
variants=variants,
use_utf8=use_utf8)
for line in lines.splitlines():
log.debug(line)
LOG_UI.debug(line)
sys.exit(exit_codes.AVOCADO_ALL_OK)
avocado/plugins/wrapper.py
浏览文件 @ f2ca8094
......@@ -12,11 +12,11 @@
# Copyright: Red Hat Inc. 2014
# Author: Ruda Moura <rmoura@redhat.com>
import logging
import os
import sys
from avocado.core import exit_codes
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI
from avocado.utils import process
......@@ -50,9 +50,8 @@ class Wrapper(CLI):
def run(self, args):
wraps = getattr(args, "wrapper", None)
if wraps:
log = logging.getLogger("avocado.app")
if getattr(args, 'gdb_run_bin', None):
log.error('Command line option --wrapper is incompatible'
LOG_UI.error('Command line option --wrapper is incompatible'
' with option --gdb-run-bin.\n%s', args.wrapper)
sys.exit(exit_codes.AVOCADO_FAIL)
......@@ -62,7 +61,7 @@ class Wrapper(CLI):
script = os.path.abspath(wrap)
process.WRAP_PROCESS = os.path.abspath(script)
else:
log.error("You can't have multiple global "
LOG_UI.error("You can't have multiple global "
"wrappers at once.")
sys.exit(exit_codes.AVOCADO_FAIL)
else:
......@@ -70,5 +69,5 @@ class Wrapper(CLI):
script = os.path.abspath(script)
process.WRAP_PROCESS_NAMES_EXPR.append((script, cmd))
if not os.path.exists(script):
log.error("Wrapper '%s' not found!", script)
LOG_UI.error("Wrapper '%s' not found!", script)
sys.exit(exit_codes.AVOCADO_FAIL)
avocado/plugins/xunit.py
浏览文件 @ f2ca8094
......@@ -16,12 +16,12 @@
"""xUnit module."""
import datetime
import logging
import os
import string
from xml.dom.minidom import Document, Element
from avocado.core.parser import FileOrStdoutAction
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI, Result
......@@ -123,8 +123,7 @@ class XUnitResult(Result):
xunit_path = getattr(job.args, 'xunit_output', 'None')
if xunit_path is not None:
if xunit_path == '-':
log = logging.getLogger("avocado.app")
log.debug(content)
LOG_UI.debug(content)
else:
with open(xunit_path, 'w') as xunit_file:
xunit_file.write(content)
......
avocado/plugins/yaml_to_mux.py
浏览文件 @ f2ca8094
......@@ -14,12 +14,12 @@
"""Multiplexer plugin to parse yaml files to params"""
import copy
import logging
import os
import re
import sys
from avocado.core import tree, exit_codes, mux
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI, Varianter
......@@ -332,10 +332,10 @@ class YamlToMux(mux.MuxPlugin, Varianter):
@staticmethod
def _log_deprecation_msg(deprecated, current):
"""
Log a message into the "avocado.app" warning log
Log a message into the avocado.LOG_UI warning log
"""
msg = "The use of '%s' is deprecated, please use '%s' instead"
logging.getLogger("avocado.app").warning(msg, deprecated, current)
LOG_UI.warning(msg, deprecated, current)
def initialize(self, args):
# Deprecated filters
......@@ -369,7 +369,7 @@ class YamlToMux(mux.MuxPlugin, Varianter):
data.merge(create_from_yaml(multiplex_files, debug))
except IOError as details:
error_msg = "%s : %s" % (details.strerror, details.filename)
logging.getLogger("avocado.app").error(error_msg)
LOG_UI.error(error_msg)
if args.subcommand == 'run':
sys.exit(exit_codes.AVOCADO_JOB_FAIL)
else:
......@@ -385,7 +385,7 @@ class YamlToMux(mux.MuxPlugin, Varianter):
args.avocado_variants.data_merge(from_yaml)
except IOError as details:
error_msg = "%s : %s" % (details.strerror, details.filename)
logging.getLogger("avocado.app").error(error_msg)
LOG_UI.error(error_msg)
if args.subcommand == 'run':
sys.exit(exit_codes.AVOCADO_JOB_FAIL)
else:
......
examples/plugins/job-pre-post/mail/avocado_job_mail.py
浏览文件 @ f2ca8094
import logging
import smtplib
from email.mime.text import MIMEText
from avocado.core.output import LOG_UI
from avocado.core.settings import settings
from avocado.core.plugin_interfaces import JobPre, JobPost
......@@ -12,7 +12,6 @@ class Mail(JobPre, JobPost):
description = 'Sends mail to notify on job start/end'
def __init__(self):
self.log = logging.getLogger("avocado.app")
self.rcpt = settings.get_value(section="plugins.job.mail",
key="recipient",
key_type=str,
......@@ -46,7 +45,7 @@ class Mail(JobPre, JobPost):
smtp.sendmail(self.sender, [self.rcpt], msg.as_string())
smtp.quit()
except:
self.log.error("Failure to send email notification: "
LOG_UI.error("Failure to send email notification: "
"please check your mail configuration")
pre = post = mail
examples/plugins/job-pre-post/sleep/avocado_job_sleep.py
浏览文件 @ f2ca8094
import time
import logging
from avocado.core.output import LOG_UI
from avocado.core.settings import settings
from avocado.core.plugin_interfaces import JobPre, JobPost
......@@ -11,7 +11,6 @@ class Sleep(JobPre, JobPost):
description = 'Sleeps for a number of seconds'
def __init__(self):
self.log = logging.getLogger("avocado.app")
self.seconds = settings.get_value(section="plugins.job.sleep",
key="seconds",
key_type=int,
......@@ -19,7 +18,7 @@ class Sleep(JobPre, JobPost):
def sleep(self, job):
for i in xrange(1, self.seconds + 1):
self.log.info("Sleeping %2i/%s", i, self.seconds)
LOG_UI.info("Sleeping %2i/%s", i, self.seconds)
time.sleep(1)
pre = post = sleep
optional_plugins/html/avocado_result_html/__init__.py
浏览文件 @ f2ca8094
......@@ -27,6 +27,7 @@ import pkg_resources
import pystache
from avocado.core import exit_codes
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI, Result
......@@ -258,15 +259,14 @@ class HTMLResult(Result):
report_contents = v.render('utf8')
except UnicodeDecodeError as details:
# FIXME: Remove me when UnicodeDecodeError problem is fixed
import logging
ui = logging.getLogger("avocado.app")
ui.critical("\n" + ("-" * 80))
ui.critical("HTML failed to render the template: %s\n\n",
LOG_UI.critical("\n" + ("-" * 80))
LOG_UI.critical("HTML failed to render the template: %s\n\n",
template)
ui.critical("-" * 80)
ui.critical("%s:\n\n", details)
ui.critical("%r", getattr(details, "object", "object not found"))
ui.critical("-" * 80)
LOG_UI.critical("-" * 80)
LOG_UI.critical("%s:\n\n", details)
LOG_UI.critical("%r", getattr(details, "object",
"object not found"))
LOG_UI.critical("-" * 80)
raise
self._copy_static_resources(output_path)
......@@ -289,8 +289,7 @@ class HTMLResult(Result):
html_path = os.path.join(html_dir, 'results.html')
self._render(result, html_path)
if getattr(job.args, 'stdout_claimed_by', None) is None:
log = logging.getLogger("avocado.app")
log.info("JOB HTML : %s", html_path)
LOG_UI.info("JOB HTML : %s", html_path)
if open_browser:
self._open_browser(html_path)
open_browser = False
......@@ -345,7 +344,6 @@ class HTML(CLI):
def run(self, args):
if 'html_output' in args and args.html_output == '-':
log = logging.getLogger("avocado.app")
log.error('HTML to stdout not supported (not all HTML resources '
'can be embedded on a single file)')
LOG_UI.error('HTML to stdout not supported (not all HTML resources'
' can be embedded on a single file)')
sys.exit(exit_codes.AVOCADO_JOB_FAIL)
optional_plugins/runner_remote/avocado_runner_remote/__init__.py
浏览文件 @ f2ca8094
......@@ -33,6 +33,7 @@ from avocado.core import exit_codes
from avocado.core import loader
from avocado.core import output
from avocado.core import status
from avocado.core.output import LOG_JOB, LOG_UI
from avocado.core.plugin_interfaces import CLI
from avocado.core.runner import TestRunner
from avocado.core.settings import settings
......@@ -491,7 +492,7 @@ class RemoteTestRunner(TestRunner):
raise exceptions.JobError('Remote machine does not seem to'
' have avocado installed')
except Exception as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise exceptions.JobError(details)
results = self.run_test(self.job.references, timeout)
remote_log_dir = os.path.dirname(results['debuglog'])
......@@ -538,7 +539,7 @@ class RemoteTestRunner(TestRunner):
try:
self.tear_down()
except Exception as details:
stacktrace.log_exc_info(sys.exc_info(), logger='avocado.test')
stacktrace.log_exc_info(sys.exc_info(), logger=LOG_JOB)
raise exceptions.JobError(details)
sys.stdout = stdout_backup
sys.stderr = stderr_backup
......@@ -616,9 +617,8 @@ class RemoteCLI(CLI):
if not getattr(args, arg):
missing.append(arg)
if missing:
log = logging.getLogger("avocado.app")
log.error("Use of %s requires %s arguments to be set. Please set "
"%s.", enable_arg, ', '.join(required_args),
LOG_UI.error("Use of %s requires %s arguments to be set. Please "
"set %s.", enable_arg, ', '.join(required_args),
', '.join(missing))
return sys.exit(exit_codes.AVOCADO_FAIL)
......
optional_plugins/runner_vm/avocado_runner_vm/__init__.py
浏览文件 @ f2ca8094
......@@ -22,6 +22,7 @@ from xml.dom import minidom
import libvirt
from avocado.core import exit_codes, exceptions
from avocado.core.output import LOG_UI
from avocado.core.plugin_interfaces import CLI
from avocado_runner_remote import Remote, RemoteTestRunner
......@@ -491,9 +492,8 @@ class VMCLI(CLI):
if not getattr(args, arg):
missing.append(arg)
if missing:
log = logging.getLogger("avocado.app")
log.error("Use of %s requires %s arguments to be set. Please set "
"%s.", enable_arg, ', '.join(required_args),
LOG_UI.error("Use of %s requires %s arguments to be set. Please "
"set %s.", enable_arg, ', '.join(required_args),
', '.join(missing))
return sys.exit(exit_codes.AVOCADO_FAIL)
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或