Update TEST check to correct behavior (dont show toolbar under TEST)

2 files changed, 11 insertions, 6 deletions

diff --git a/debug_toolbar/middleware.py b/debug_toolbar/middleware.py
index b1ab737..fa64a16 100644
--- a/debug_toolbar/middleware.py
+++ b/debug_toolbar/middleware.py
@@ -58,14 +58,19 @@ class DebugToolbarMiddleware(object):
                 self.tag = u'</' + tag + u'>'
 
     def _show_toolbar(self, request):
+        if getattr(settings, 'TEST', False):
+            return False
+
         x_forwarded_for = request.META.get('HTTP_X_FORWARDED_FOR', None)
         if x_forwarded_for:
             remote_addr = x_forwarded_for.split(',')[0].strip()
         else:
             remote_addr = request.META.get('REMOTE_ADDR', None)
-        # if not internal ip, and not DEBUG or TEST
-        if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG or getattr(settings, 'TEST', False)):
+
+        # if not internal ip, and not DEBUG
+        if not (remote_addr in settings.INTERNAL_IPS or settings.DEBUG):
             return False
+
         return True
 
     def process_request(self, request):
diff --git a/debug_toolbar/tests/tests.py b/debug_toolbar/tests/tests.py
index 83cc9dc..3fc2aff 100644
--- a/debug_toolbar/tests/tests.py
+++ b/debug_toolbar/tests/tests.py
@@ -65,12 +65,12 @@ class DebugToolbarTestCase(BaseTestCase):
         
         middleware = DebugToolbarMiddleware()
         
-        with Settings(TEST=True):
-            self.assertTrue(middleware._show_toolbar(request))
-
-        with Settings(TEST=False):
+        with Settings(TEST=True, DEBUG=True):
             self.assertFalse(middleware._show_toolbar(request))
 
+        with Settings(TEST=False, DEBUG=True):
+            self.assertTrue(middleware._show_toolbar(request))
+
     def test_show_toolbar_INTERNAL_IPS(self):
         request = self.request