Merge pull request #15674 from edx/jmbowman/PLAT-1590

PLAT-1590 Fixes for Docker Devstack e2e tests

cms/envs/devstack.py

@@ -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.

cms/envs/devstack_docker.py

@@ -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)
 
 

lms/envs/devstack.py

@@ -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 #################################

lms/envs/devstack_docker.py

@@ -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)