Commit 630c2fa2 by Calen Pennington

Make jasmine testing quieter

parent 3c90e292
...@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log", ...@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
logging_env="dev", logging_env="dev",
tracking_filename="tracking.log", tracking_filename="tracking.log",
dev_env=True, dev_env=True,
debug=True) debug=True,
local_loglevel='ERROR',
console_loglevel='ERROR')
PIPELINE_JS['js-test-source'] = { PIPELINE_JS['js-test-source'] = {
'source_filenames': sum([ 'source_filenames': sum([
......
...@@ -3,6 +3,7 @@ import platform ...@@ -3,6 +3,7 @@ import platform
import sys import sys
from logging.handlers import SysLogHandler from logging.handlers import SysLogHandler
LOG_LEVELS = ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']
def get_logger_config(log_dir, def get_logger_config(log_dir,
logging_env="no_env", logging_env="no_env",
...@@ -11,7 +12,8 @@ def get_logger_config(log_dir, ...@@ -11,7 +12,8 @@ def get_logger_config(log_dir,
dev_env=False, dev_env=False,
syslog_addr=None, syslog_addr=None,
debug=False, debug=False,
local_loglevel='INFO'): local_loglevel='INFO',
console_loglevel=None):
""" """
...@@ -30,9 +32,12 @@ def get_logger_config(log_dir, ...@@ -30,9 +32,12 @@ def get_logger_config(log_dir,
""" """
# Revert to INFO if an invalid string is passed in # Revert to INFO if an invalid string is passed in
if local_loglevel not in ['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL']: if local_loglevel not in LOG_LEVELS:
local_loglevel = 'INFO' local_loglevel = 'INFO'
if console_loglevel is None or console_loglevel not in LOG_LEVELS:
console_loglevel = 'DEBUG' if debug else 'INFO'
hostname = platform.node().split(".")[0] hostname = platform.node().split(".")[0]
syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s " syslog_format = ("[%(name)s][env:{logging_env}] %(levelname)s "
"[{hostname} %(process)d] [%(filename)s:%(lineno)d] " "[{hostname} %(process)d] [%(filename)s:%(lineno)d] "
...@@ -55,7 +60,7 @@ def get_logger_config(log_dir, ...@@ -55,7 +60,7 @@ def get_logger_config(log_dir,
}, },
'handlers': { 'handlers': {
'console': { 'console': {
'level': 'DEBUG' if debug else 'INFO', 'level': console_loglevel,
'class': 'logging.StreamHandler', 'class': 'logging.StreamHandler',
'formatter': 'standard', 'formatter': 'standard',
'stream': sys.stdout, 'stream': sys.stdout,
......
...@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log", ...@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
logging_env="dev", logging_env="dev",
tracking_filename="tracking.log", tracking_filename="tracking.log",
dev_env=True, dev_env=True,
debug=True) debug=True,
local_loglevel='ERROR',
console_loglevel='ERROR')
PIPELINE_JS['js-test-source'] = { PIPELINE_JS['js-test-source'] = {
'source_filenames': sum([ 'source_filenames': sum([
......
...@@ -47,7 +47,7 @@ def django_for_jasmine(system, django_reload) ...@@ -47,7 +47,7 @@ def django_for_jasmine(system, django_reload)
end end
django_pid = fork do django_pid = fork do
exec(*django_admin(system, 'jasmine', 'runserver', "12345", reload_arg).split(' ')) exec(*django_admin(system, 'jasmine', 'runserver', '-v', '0', "12345", reload_arg).split(' '))
end end
jasmine_url = 'http://localhost:12345/_jasmine/' jasmine_url = 'http://localhost:12345/_jasmine/'
up = false up = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment