Merge pull request #453 from aaugustin/disable-instrumentation-for-disabled-panels

Disable instrumentation for disabled panels

4 files changed, 41 insertions, 2 deletions

diff --git a/tests/panels/test_cache.py b/tests/panels/test_cache.py
new file mode 100644
index 0000000..f3c359c
--- /dev/null
+++ b/tests/panels/test_cache.py
@@ -0,0 +1,28 @@
+# coding: utf-8
+
+from __future__ import unicode_literals
+
+from django.core import cache
+
+from debug_toolbar.panels.cache import CacheDebugPanel
+
+from ..base import BaseTestCase
+
+
+class CachePanelTestCase(BaseTestCase):
+
+    def setUp(self):
+        super(CachePanelTestCase, self).setUp()
+        self.panel = self.toolbar.get_panel(CacheDebugPanel)
+        self.panel.enable_instrumentation()
+
+    def tearDown(self):
+        self.panel.disable_instrumentation()
+        super(CachePanelTestCase, self).tearDown()
+
+    def test_recording(self):
+        self.assertEqual(len(self.panel.calls), 0)
+        cache.cache.set('foo', 'bar')
+        cache.cache.get('foo')
+        cache.cache.delete('foo')
+        self.assertEqual(len(self.panel.calls), 3)
diff --git a/tests/panels/test_sql.py b/tests/panels/test_sql.py
index a1de0ea..56b70dc 100644
--- a/tests/panels/test_sql.py
+++ b/tests/panels/test_sql.py
@@ -17,6 +17,11 @@ class SQLPanelTestCase(BaseTestCase):
     def setUp(self):
         super(SQLPanelTestCase, self).setUp()
         self.panel = self.toolbar.get_panel(SQLDebugPanel)
+        self.panel.enable_instrumentation()
+
+    def tearDown(self):
+        self.panel.disable_instrumentation()
+        super(SQLPanelTestCase, self).tearDown()
 
     def test_recording(self):
         self.assertEqual(len(self.panel._queries), 0)
diff --git a/tests/panels/test_template.py b/tests/panels/test_template.py
index c98521e..545ad9b 100644
--- a/tests/panels/test_template.py
+++ b/tests/panels/test_template.py
@@ -18,6 +18,12 @@ class TemplateDebugPanelTestCase(BaseTestCase):
     def setUp(self):
         super(TemplateDebugPanelTestCase, self).setUp()
         self.panel = self.toolbar.get_panel(TemplateDebugPanel)
+        self.sql_panel = self.toolbar.get_panel(SQLDebugPanel)
+        self.sql_panel.enable_instrumentation()
+
+    def tearDown(self):
+        self.sql_panel.disable_instrumentation()
+        super(TemplateDebugPanelTestCase, self).tearDown()
 
     def test_queryset_hook(self):
         t = Template("No context variables here!")
@@ -30,8 +36,7 @@ class TemplateDebugPanelTestCase(BaseTestCase):
         t.render(c)
 
         # ensure the query was NOT logged
-        sql_panel = self.toolbar.get_panel(SQLDebugPanel)
-        self.assertEqual(len(sql_panel._queries), 0)
+        self.assertEqual(len(self.sql_panel._queries), 0)
 
         base_ctx_idx = 1 if django.VERSION[:2] >= (1, 5) else 0
         ctx = self.panel.templates[0]['context'][base_ctx_idx]
diff --git a/tests/tests.py b/tests/tests.py
index e373d51..b926895 100644
--- a/tests/tests.py
+++ b/tests/tests.py
@@ -2,6 +2,7 @@ import django
 
 if django.VERSION[:2] < (1, 6):     # unittest-style discovery isn't available
     from .commands.test_debugsqlshell import *                          # noqa
+    from .panels.test_cache import *                                    # noqa
     from .panels.test_logger import *                                   # noqa
     from .panels.test_profiling import *                                # noqa
     from .panels.test_request_vars import *                             # noqa