Merge pull request django-commons#988 from radwon/ticket_792

Fixed django-commons#792 -- KeyError in ProfilingPanel

Author: matthiask

debug_toolbar/panels/profiling.py

@@ -167,12 +167,13 @@ def generate_stats(self, request, response):
         self.stats = DjangoDebugToolbarStats(self.profiler)
         self.stats.calc_callees()
 
-        root = FunctionCall(self.stats, self.stats.get_root_func(), depth=0)
-
-        func_list = []
-        self.add_node(func_list,
-                      root,
-                      dt_settings.get_config()['PROFILER_MAX_DEPTH'],
-                      root.stats[3] / 8)
-
-        self.record_stats({'func_list': func_list})
+        root_func = self.stats.get_root_func()
+        # Ensure root function exists before continuing with function call analysis
+        if root_func:
+            root = FunctionCall(self.stats, root_func, depth=0)
+            func_list = []
+            self.add_node(func_list,
+                          root,
+                          dt_settings.get_config()['PROFILER_MAX_DEPTH'],
+                          root.stats[3] / 8)
+            self.record_stats({'func_list': func_list})

tests/panels/test_profiling.py

@@ -47,6 +47,24 @@ def test_listcomp_escaped(self):
         self.assertNotIn('<span class="djdt-func"><listcomp></span>', self.panel.content)
         self.assertIn('<span class="djdt-func">&lt;listcomp&gt;</span>', self.panel.content)
 
+    def test_generate_stats_no_profiler(self):
+        """
+        Test generating stats with no profiler.
+        """
+        self.assertIsNone(self.panel.generate_stats(self.request, self.response))
+
+    def test_generate_stats_no_root_func(self):
+        """
+        Test generating stats using profiler without root function.
+        """
+        self.panel.process_view(self.request, regular_view, ('profiling',), {})
+        self.panel.process_response(self.request, self.response)
+        self.panel.profiler.clear()
+        self.panel.profiler.enable()
+        self.panel.profiler.disable()
+        self.panel.generate_stats(self.request, self.response)
+        self.assertNotIn('func_list', self.panel.get_stats())
+
 
 @override_settings(DEBUG=True,
                    DEBUG_TOOLBAR_PANELS=['debug_toolbar.panels.profiling.ProfilingPanel'])