Commit 3538074c by Daniel Friedman

Merge pull request #7125 from edx/django-upgrade/backport-changes/SECRET_KEY

Backport dummy SECRET_KEYs from django 1.5 upgrade
parents f9080590 fa968c62
...@@ -121,3 +121,7 @@ except ImportError: ...@@ -121,3 +121,7 @@ except ImportError:
YOUTUBE['API'] = "127.0.0.1:{0}/get_youtube_api/".format(YOUTUBE_PORT) 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['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) 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
...@@ -84,6 +84,10 @@ MOCK_SEARCH_BACKING_FILE = ( ...@@ -84,6 +84,10 @@ MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath() ).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. # Lastly, see if the developer has any local overrides.
try: try:
......
...@@ -93,3 +93,6 @@ except ImportError: ...@@ -93,3 +93,6 @@ except ImportError:
##################################################################### #####################################################################
# Lastly, run any migrations, if needed. # Lastly, run any migrations, if needed.
MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE) MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
# Dummy secret key for dev
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
...@@ -238,7 +238,6 @@ FEATURES['USE_MICROSITES'] = True ...@@ -238,7 +238,6 @@ FEATURES['USE_MICROSITES'] = True
# the one in lms/envs/test.py # the one in lms/envs/test.py
FEATURES['ENABLE_DISCUSSION_SERVICE'] = False FEATURES['ENABLE_DISCUSSION_SERVICE'] = False
# Enable content libraries code for the tests # Enable content libraries code for the tests
FEATURES['ENABLE_CONTENT_LIBRARIES'] = True FEATURES['ENABLE_CONTENT_LIBRARIES'] = True
...@@ -262,3 +261,6 @@ SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine" ...@@ -262,3 +261,6 @@ SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine"
MOCK_SEARCH_BACKING_FILE = ( MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath() ).abspath()
# Dummy secret key for dev/test
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
...@@ -183,3 +183,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO ...@@ -183,3 +183,7 @@ YOUTUBE['TEXT_API']['url'] = "127.0.0.1:{0}/test_transcripts_youtube/".format(YO
if FEATURES.get('ENABLE_COURSEWARE_SEARCH'): if FEATURES.get('ENABLE_COURSEWARE_SEARCH'):
# Use MockSearchEngine as the search engine for test scenario # Use MockSearchEngine as the search engine for test scenario
SEARCH_ENGINE = "search.tests.mock_search_engine.MockSearchEngine" 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
...@@ -127,6 +127,10 @@ MOCK_SEARCH_BACKING_FILE = ( ...@@ -127,6 +127,10 @@ MOCK_SEARCH_BACKING_FILE = (
TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter TEST_ROOT / "index_file.dat" # pylint: disable=no-value-for-parameter
).abspath() ).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. # Lastly, see if the developer has any local overrides.
try: try:
......
...@@ -134,3 +134,5 @@ except ImportError: ...@@ -134,3 +134,5 @@ except ImportError:
##################################################################### #####################################################################
# Lastly, run any migrations, if needed. # Lastly, run any migrations, if needed.
MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE) MODULESTORE = convert_module_store_setting_if_needed(MODULESTORE)
SECRET_KEY = '85920908f28904ed733fe576320db18cabd7b6cd'
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