From 70c0b7bd3dcac6ceb8858f2dc8b2dcf796d1cd21 Mon Sep 17 00:00:00 2001
From: Jeremy Bowman <jbowman@edx.org>
Date: Wed, 26 Jul 2017 15:07:57 -0400
Subject: [PATCH] PLAT-1590 Fixes for Docker Devstack e2e tests

---
 cms/envs/devstack.py        | 5 +++--
 cms/envs/devstack_docker.py | 2 +-
 lms/envs/devstack.py        | 5 +++--
 lms/envs/devstack_docker.py | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cms/envs/devstack.py b/cms/envs/devstack.py
index a5e32fa831..fecdef3e7d 100644
--- a/cms/envs/devstack.py
+++ b/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.
diff --git a/cms/envs/devstack_docker.py b/cms/envs/devstack_docker.py
index 26721fd2a6..e4045b024f 100644
--- a/cms/envs/devstack_docker.py
+++ b/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)
 
 
diff --git a/lms/envs/devstack.py b/lms/envs/devstack.py
index d1f84397d0..b5317e2415 100644
--- a/lms/envs/devstack.py
+++ b/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 #################################
diff --git a/lms/envs/devstack_docker.py b/lms/envs/devstack_docker.py
index 0557d8c63e..c8db837fcd 100644
--- a/lms/envs/devstack_docker.py
+++ b/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)