Commit b42eacaa by ihoover

moved MAX_AUTO_AUTH_USERS to ENV_TOKENS

parent ee4bc424
...@@ -929,10 +929,7 @@ def auto_auth(request): ...@@ -929,10 +929,7 @@ def auto_auth(request):
name_base = 'USER_' name_base = 'USER_'
pass_base = 'PASS_' pass_base = 'PASS_'
max_users = 200 max_users = settings.MITX_FEATURES.get('MAX_AUTO_AUTH_USERS', 200)
if hasattr(settings, 'MAX_AUTO_AUTH_USERS'):
max_users = settings.MAX_AUTO_AUTH_USERS
number = random.randint(1, max_users) number = random.randint(1, max_users)
username = name_base + str(number) username = name_base + str(number)
......
...@@ -180,6 +180,8 @@ COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", []) ...@@ -180,6 +180,8 @@ COURSES_WITH_UNSAFE_CODE = ENV_TOKENS.get("COURSES_WITH_UNSAFE_CODE", [])
# automatic log in for load testing # automatic log in for load testing
MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] = ENV_TOKENS.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING') MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] = ENV_TOKENS.get('AUTOMATIC_AUTH_FOR_LOAD_TESTING')
MITX_FEATURES['MAX_AUTO_AUTH_USERS'] = ENV_TOKENS.get('MAX_AUTO_AUTH_USERS')
############################## SECURE AUTH ITEMS ############### ############################## SECURE AUTH ITEMS ###############
# Secret things: passwords, access keys, etc. # Secret things: passwords, access keys, etc.
......
...@@ -37,9 +37,6 @@ PLATFORM_NAME = "edX" ...@@ -37,9 +37,6 @@ PLATFORM_NAME = "edX"
COURSEWARE_ENABLED = True COURSEWARE_ENABLED = True
ENABLE_JASMINE = False ENABLE_JASMINE = False
# only relevant if MITX_FEATURES['AUTOMATIC_AUTH_FOR_LOAD_TESTING'] = True
MAX_AUTO_AUTH_USERS = 200
PERFSTATS = False PERFSTATS = False
DISCUSSION_SETTINGS = { DISCUSSION_SETTINGS = {
......
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