Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Backport dummy SECRET_KEYs from django 1.5 upgrade

Browse Source
This commit is contained in:
Daniel Friedman
2015-02-26 11:54:37 -05:00
parent 81ee300132
commit fa968c6218
7 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/envs/acceptance.py
View File

@@ -121,3 +121,7 @@ except ImportError:
YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT)
YOUTUBE['TEST_URL'] = "127.0.0.1:{0}/test_youtube/".format(YOUTUBE_PORT)
YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YOUTUBE_PORT)
# Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid
SECRET_KEY = uuid.uuid4().hex

4
cms/envs/bok_choy.py
View File

@@ -84,6 +84,10 @@ MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath()
# Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid
SECRET_KEY = uuid.uuid4().hex
#####################################################################
# Lastly, see if the developer has any local overrides.
try:

3
cms/envs/devstack.py
View File

@@ -93,3 +93,6 @@ except ImportError:
#####################################################################
# Lastly, run any migrations, if needed.
MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
# Dummy secret key for dev
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'

4
cms/envs/test.py
View File

@@ -238,7 +238,6 @@ FEATURES['USE_MICROSITES'] = True
# the one in lms/envs/test.py
FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
# Enable content libraries code for the tests
FEATURES['ENABLE_CONTENT_LIBRARIES'] = True
@@ -262,3 +261,6 @@ SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine"
MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath()
# Dummy secret key for dev/test
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'

4
lms/envs/acceptance.py
View File

@@ -183,3 +183,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO
if FEATURES.get('ENABLE_COURSEWARE_SEARCH'):
# Use MockSearchEngine as the search engine for test scenario
SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine"
# Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid
SECRET_KEY = uuid.uuid4().hex

4
lms/envs/bok_choy.py
View File

@@ -127,6 +127,10 @@ MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath()
# Generate a random UUID so that different runs of acceptance tests don't break each other
import uuid
SECRET_KEY = uuid.uuid4().hex
#####################################################################
# Lastly, see if the developer has any local overrides.
try:

2
lms/envs/devstack.py
View File

@@ -134,3 +134,5 @@ except ImportError:
#####################################################################
# Lastly, run any migrations, if needed.
MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'