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
d226b55b
Commit
d226b55b
authored
Feb 09, 2016
by
muhammad-ammar
Committed by
muzaffaryousaf
Feb 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't catch exception to raise http500
TNL-4043
parent
ee637c58
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 additions
and
20 deletions
+1
-20
lms/djangoapps/edxnotes/tests.py
+0
-16
lms/djangoapps/edxnotes/views.py
+1
-4
No files found.
lms/djangoapps/edxnotes/tests.py
View file @
d226b55b
...
...
@@ -1007,22 +1007,6 @@ class EdxNotesViewsTest(ModuleStoreTestCase):
self
.
assertEqual
(
response
.
status_code
,
404
)
@patch.dict
(
"django.conf.settings.FEATURES"
,
{
"ENABLE_EDXNOTES"
:
True
})
@ddt.unpack
@ddt.data
(
{
'side_effect'
:
EdxNotesServiceUnavailable
},
{
'side_effect'
:
EdxNotesServiceUnavailable
},
)
def
test_edxnotes_view_500_error
(
self
,
side_effect
):
"""
Tests that 500 status code is received for EdxNotesServiceUnavailable or EdxNotesServiceUnavailable exceptions.
"""
with
patch
(
"edxnotes.views.get_notes"
,
autospec
=
True
)
as
mock_get_notes
:
mock_get_notes
.
side_effect
=
side_effect
enable_edxnotes_for_the_course
(
self
.
course
,
self
.
user
.
id
)
response
=
self
.
client
.
get
(
self
.
notes_page_url
)
self
.
assertEqual
(
response
.
status_code
,
500
)
@patch.dict
(
"django.conf.settings.FEATURES"
,
{
"ENABLE_EDXNOTES"
:
True
})
@patch
(
"edxnotes.views.get_notes"
,
autospec
=
True
)
def
test_search_notes_successfully_respond
(
self
,
mock_search
):
"""
...
...
lms/djangoapps/edxnotes/views.py
View file @
d226b55b
...
...
@@ -46,10 +46,7 @@ def edxnotes(request, course_id):
if
not
is_feature_enabled
(
course
):
raise
Http404
try
:
notes_info
=
get_notes
(
request
,
course
)
except
(
EdxNotesParseError
,
EdxNotesServiceUnavailable
)
as
err
:
return
JsonResponseBadRequest
({
"error"
:
err
.
message
},
status
=
500
)
notes_info
=
get_notes
(
request
,
course
)
context
=
{
"course"
:
course
,
...
...
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