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

PLAT-1590 Fixes for Docker Devstack e2e tests

Browse Source
This commit is contained in:
Jeremy Bowman
2017-07-26 15:07:57 -04:00
parent 5fea8b8b66
commit 70c0b7bd3d
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cms/envs/devstack.py
View File

@@ -90,8 +90,9 @@ DEBUG_TOOLBAR_CONFIG = {
}
def should_show_debug_toolbar(_):
return True # We always want the toolbar on devstack regardless of IP, auth, etc.
def should_show_debug_toolbar(request):
# We always want the toolbar on devstack unless running tests from another Docker container
return not request.get_host().startswith('edx.devstack.studio:')
# To see stacktraces for MongoDB queries, set this to True.

2
cms/envs/devstack_docker.py
View File

@@ -10,7 +10,7 @@ LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
LOGGING['loggers']['tracking']['handlers'] = ['console']
LMS_BASE = 'edx.devstack.lms:18000'
CMS_BASE = 'edx.devstack.cms:18010'
CMS_BASE = 'edx.devstack.studio:18010'
LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)

5
lms/envs/devstack.py
View File

@@ -87,8 +87,9 @@ DEBUG_TOOLBAR_CONFIG = {
}
def should_show_debug_toolbar(_):
return True # We always want the toolbar on devstack regardless of IP, auth, etc.
def should_show_debug_toolbar(request):
# We always want the toolbar on devstack unless running tests from another Docker container
return not request.get_host().startswith('edx.devstack.lms:')
########################### PIPELINE #################################

2
lms/envs/devstack_docker.py
View File

@@ -10,7 +10,7 @@ LOGGING['handlers']['local'] = LOGGING['handlers']['tracking'] = {
LOGGING['loggers']['tracking']['handlers'] = ['console']
LMS_BASE = 'edx.devstack.lms:18000'
CMS_BASE = 'edx.devstack.cms:18010'
CMS_BASE = 'edx.devstack.studio:18010'
SITE_NAME = LMS_BASE
LMS_ROOT_URL = 'http://{}'.format(LMS_BASE)