Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
650f5377
Commit
650f5377
authored
Nov 16, 2012
by
Calen Pennington
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1043 from MITx/feature/cale/quieter-jasmine-tests
Make jasmine testing quieter
parents
3b2b8ad4
630c2fa2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
6 deletions
+15
-6
cms/envs/jasmine.py
+3
-1
common/lib/logsettings.py
+8
-3
lms/envs/jasmine.py
+3
-1
rakefile
+1
-1
No files found.
cms/envs/jasmine.py
View file @
650f5377
...
...
@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
logging_env
=
"dev"
,
tracking_filename
=
"tracking.log"
,
dev_env
=
True
,
debug
=
True
)
debug
=
True
,
local_loglevel
=
'ERROR'
,
console_loglevel
=
'ERROR'
)
PIPELINE_JS
[
'js-test-source'
]
=
{
'source_filenames'
:
sum
([
...
...
common/lib/logsettings.py
View file @
650f5377
...
...
@@ -3,6 +3,7 @@ import platform
import
sys
from
logging.handlers
import
SysLogHandler
LOG_LEVELS
=
[
'DEBUG'
,
'INFO'
,
'WARNING'
,
'ERROR'
,
'CRITICAL'
]
def
get_logger_config
(
log_dir
,
logging_env
=
"no_env"
,
...
...
@@ -11,7 +12,8 @@ def get_logger_config(log_dir,
dev_env
=
False
,
syslog_addr
=
None
,
debug
=
False
,
local_loglevel
=
'INFO'
):
local_loglevel
=
'INFO'
,
console_loglevel
=
None
):
"""
...
...
@@ -30,9 +32,12 @@ def get_logger_config(log_dir,
"""
# 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'
if
console_loglevel
is
None
or
console_loglevel
not
in
LOG_LEVELS
:
console_loglevel
=
'DEBUG'
if
debug
else
'INFO'
hostname
=
platform
.
node
()
.
split
(
"."
)[
0
]
syslog_format
=
(
"[
%(name)
s][env:{logging_env}]
%(levelname)
s "
"[{hostname}
%(process)
d] [
%(filename)
s:
%(lineno)
d] "
...
...
@@ -55,7 +60,7 @@ def get_logger_config(log_dir,
},
'handlers'
:
{
'console'
:
{
'level'
:
'DEBUG'
if
debug
else
'INFO'
,
'level'
:
console_loglevel
,
'class'
:
'logging.StreamHandler'
,
'formatter'
:
'standard'
,
'stream'
:
sys
.
stdout
,
...
...
lms/envs/jasmine.py
View file @
650f5377
...
...
@@ -12,7 +12,9 @@ LOGGING = get_logger_config(TEST_ROOT / "log",
logging_env
=
"dev"
,
tracking_filename
=
"tracking.log"
,
dev_env
=
True
,
debug
=
True
)
debug
=
True
,
local_loglevel
=
'ERROR'
,
console_loglevel
=
'ERROR'
)
PIPELINE_JS
[
'js-test-source'
]
=
{
'source_filenames'
:
sum
([
...
...
rakefile
View file @
650f5377
...
...
@@ -49,7 +49,7 @@ def django_for_jasmine(system, django_reload)
end
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
jasmine_url
=
'http://localhost:12345/_jasmine/'
up
=
false
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment