From bf230a738b18ff00d8cf78de09a14dbc9a273dca Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 17 Jun 2020 15:05:57 +0000 Subject: [PATCH] Added a test suite switch to optionally show logging output. Normally this is suppressed while running tests. In production, it goes to syslog's user facility. With --show-logging, it will go to the console when running tests. - Legacy-Id: 18010 --- ietf/utils/log.py | 9 ++++----- ietf/utils/test_runner.py | 7 ++++++- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ietf/utils/log.py b/ietf/utils/log.py index 3751f98d4..8208e751a 100644 --- a/ietf/utils/log.py +++ b/ietf/utils/log.py @@ -62,11 +62,10 @@ def log(msg, e=None): pass _logfunc = logfunc if settings.SERVER_MODE == 'test': -## Comment in when debugging for instance test smtp server failures: -# if e: -# _logfunc = debug.say -# _flushfunc = sys.stdout.flush # pyflakes:ignore (intentional redefinition) -# else: + if settings.show_logging: + _logfunc = debug.say + _flushfunc = sys.stdout.flush # pyflakes:ignore (intentional redefinition) + else: return elif settings.DEBUG == True: _logfunc = debug.say diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py index a75f91ae7..5826a6f67 100644 --- a/ietf/utils/test_runner.py +++ b/ietf/utils/test_runner.py @@ -516,13 +516,18 @@ class IetfTestRunner(DiscoverRunner): parser.add_argument('--permit-mixed-migrations', action='store_true', default=False, help='Permit interleaved unreleased migrations') + parser.add_argument('--show-logging', + action='store_true', default=False, + help='Show logging output going to LOG_USER in production mode') - def __init__(self, skip_coverage=False, save_version_coverage=None, html_report=None, permit_mixed_migrations=None, **kwargs): + def __init__(self, skip_coverage=False, save_version_coverage=None, html_report=None, permit_mixed_migrations=None, show_logging=None, **kwargs): # self.check_coverage = not skip_coverage self.save_version_coverage = save_version_coverage self.html_report = html_report self.permit_mixed_migrations = permit_mixed_migrations + self.show_logging = show_logging + settings.show_logging = show_logging # self.root_dir = os.path.dirname(settings.BASE_DIR) self.coverage_file = os.path.join(self.root_dir, settings.TEST_COVERAGE_MASTER_FILE)