Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
3538074c
Commit
3538074c
authored
Feb 26, 2015
by
Daniel Friedman
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7125 from edx/django-upgrade/backport-changes/SECRET_KEY
Backport dummy SECRET_KEYs from django 1.5 upgrade
parents
f9080590
fa968c62
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
24 additions
and
1 deletions
+24
-1
cms/envs/acceptance.py
+4
-0
cms/envs/bok_choy.py
+4
-0
cms/envs/devstack.py
+3
-0
cms/envs/test.py
+3
-1
lms/envs/acceptance.py
+4
-0
lms/envs/bok_choy.py
+4
-0
lms/envs/devstack.py
+2
-0
No files found.
cms/envs/acceptance.py
View file @
3538074c
...
...
@@ -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
cms/envs/bok_choy.py
View file @
3538074c
...
...
@@ -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
:
...
...
cms/envs/devstack.py
View file @
3538074c
...
...
@@ -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'
cms/envs/test.py
View file @
3538074c
...
...
@@ -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'
lms/envs/acceptance.py
View file @
3538074c
...
...
@@ -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
lms/envs/bok_choy.py
View file @
3538074c
...
...
@@ -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
:
...
...
lms/envs/devstack.py
View file @
3538074c
...
...
@@ -134,3 +134,5 @@ except ImportError:
#####################################################################
# Lastly, run any migrations, if needed.
MODULESTORE
=
convert_module_store_setting_if_needed
(
MODULESTORE
)
SECRET_KEY
=
'85920908f28904ed733fe576320db18cabd7b6cd'
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment