Fixed last lms/djangoapps/discussion test failures - BOM-680

This commit is contained in:
Jeremy Bowman
2019-09-19 10:38:49 -04:00
parent a8a88c534a
commit 91c87fd65b
2 changed files with 6 additions and 5 deletions

View File

@@ -28,7 +28,7 @@ from util.testing import UrlResetMixin
@override_settings(SECRET_KEY="test secret key")
class NotificationPrefViewTest(UrlResetMixin, TestCase):
INITIALIZATION_VECTOR = "\x00" * 16
INITIALIZATION_VECTOR = b"\x00" * 16
@patch.dict("django.conf.settings.FEATURES", {"ENABLE_DISCUSSION_SERVICE": True})
def setUp(self):

View File

@@ -73,17 +73,18 @@ def perform_request(method, url, data_or_params=None, raw=False,
)
metric_tags.append(u'status_code:{}'.format(response.status_code))
if response.status_code > 200:
status_code = int(response.status_code)
if status_code > 200:
metric_tags.append(u'result:failure')
else:
metric_tags.append(u'result:success')
if 200 < response.status_code < 500:
if 200 < status_code < 500:
raise CommentClientRequestError(response.text, response.status_code)
# Heroku returns a 503 when an application is in maintenance mode
elif response.status_code == 503:
elif status_code == 503:
raise CommentClientMaintenanceError(response.text)
elif response.status_code == 500:
elif status_code == 500:
raise CommentClient500Error(response.text)
else:
if raw: