From e78edf8ef9f0eb1d4a0799e75e602dabaedfc116 Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 7 Aug 2013 16:38:10 -0400 Subject: [PATCH] Rename MITX_SETTING AUTOMATIC_AUTH_FOR_LOAD_TESTING -> AUTOMATIC_AUTH_FOR_TESTING because it will be used for acceptance testing also. --- cms/urls.py | 2 +- common/djangoapps/student/tests/test_auto_auth.py | 8 ++++---- common/djangoapps/student/views.py | 4 ++-- lms/envs/common.py | 2 +- lms/urls.py | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cms/urls.py b/cms/urls.py index 0beb21362e..8f396d3742 100644 --- a/cms/urls.py +++ b/cms/urls.py @@ -147,7 +147,7 @@ if settings.MITX_FEATURES.get('ENABLE_SERVICE_STATUS'): urlpatterns += (url(r'^admin/', include(admin.site.urls)),) # enable automatic login -if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING'): +if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'): urlpatterns += ( url(r'^auto_auth$', 'student.views.auto_auth'), ) diff --git a/common/djangoapps/student/tests/test_auto_auth.py b/common/djangoapps/student/tests/test_auto_auth.py index a61591dc89..f9c4ae63de 100644 --- a/common/djangoapps/student/tests/test_auto_auth.py +++ b/common/djangoapps/student/tests/test_auto_auth.py @@ -11,9 +11,9 @@ class AutoAuthEnabledTestCase(UrlResetMixin, TestCase): Tests for the Auto auth view that we have for load testing. """ - @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_LOAD_TESTING": True}) + @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_TESTING": True}) def setUp(self): - # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] + # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] # value affects the contents of urls.py, # so we need to call super.setUp() which reloads urls.py (because # of the UrlResetMixin) @@ -102,9 +102,9 @@ class AutoAuthDisabledTestCase(UrlResetMixin, TestCase): Test that the page is inaccessible with default settings """ - @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_LOAD_TESTING": False}) + @patch.dict("django.conf.settings.MITX_FEATURES", {"AUTOMATIC_AUTH_FOR_TESTING": False}) def setUp(self): - # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] + # Patching the settings.MITX_FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] # value affects the contents of urls.py, # so we need to call super.setUp() which reloads urls.py (because # of the UrlResetMixin) diff --git a/common/djangoapps/student/views.py b/common/djangoapps/student/views.py index ddae3a294e..0b061f5a94 100644 --- a/common/djangoapps/student/views.py +++ b/common/djangoapps/student/views.py @@ -703,7 +703,7 @@ def create_account(request, post_override=None): message = render_to_string('emails/activation_email.txt', d) # dont send email if we are doing load testing or random user generation for some reason - if not (settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING')): + if not (settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING')): try: if settings.MITX_FEATURES.get('REROUTE_ACTIVATION_EMAIL'): dest_addr = settings.MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] @@ -942,7 +942,7 @@ def auto_auth(request): """ Automatically logs the user in with a generated random credentials This view is only accessible when - settings.MITX_SETTINGS['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] is true. + settings.MITX_SETTINGS['AUTOMATIC_AUTH_FOR_TESTING'] is true. """ def get_dummy_post_data(username, password, email, name): diff --git a/lms/envs/common.py b/lms/envs/common.py index 653040297c..0cbcbb774a 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -151,7 +151,7 @@ MITX_FEATURES = { 'ENABLE_HINTER_INSTRUCTOR_VIEW': False, # for load testing - 'AUTOMATIC_AUTH_FOR_LOAD_TESTING': False, + 'AUTOMATIC_AUTH_FOR_TESTING': False, # Toggle to enable chat availability (configured on a per-course # basis in Studio) diff --git a/lms/urls.py b/lms/urls.py index 380b5ea91d..b32c0263d0 100644 --- a/lms/urls.py +++ b/lms/urls.py @@ -439,7 +439,7 @@ if settings.MITX_FEATURES.get('ENABLE_HINTER_INSTRUCTOR_VIEW'): ) # enable automatic login -if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING'): +if settings.MITX_FEATURES.get('AUTOMATIC_AUTH_FOR_TESTING'): urlpatterns += ( url(r'^auto_auth$', 'student.views.auto_auth'), )