Properly handle load (and other) tags in inheriting templates

Author: nedbat

django_coverage_plugin/plugin.py

@@ -176,7 +176,7 @@ def statements(self):
                     )
                 )
             if token.token_type == TOKEN_BLOCK:
-                if token.contents == 'endcomment':
+                if token.contents == "endcomment":
                     comment = False
                     continue
 
@@ -191,7 +191,12 @@ def statements(self):
                     if extends:
                         continue
 
-                if token.contents == 'comment':
+                if extends and not inblock:
+                    # In an inheriting tempalte, ignore all tags outside of
+                    # blocks.
+                    continue
+
+                if token.contents == "comment":
                     comment = True
                 if token.contents.startswith("end"):
                     continue

setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='django_coverage_plugin',
-    version='0.3.3',
+    version='0.3.4',
     description='Django template coverage.py plugin',
     author='Ned Batchelder',
     author_email='[email protected]',

tests/test_extends.py

@@ -102,7 +102,7 @@ def test_inheriting_with_unused_blocks(self):
 
 
 class LoadTest(DjangoPluginTestCase):
-    def test_loads(self):
+    def test_load(self):
         self.make_template(name="load.html", text="""\
             {% load i18n %}
 
@@ -114,3 +114,23 @@ def test_loads(self):
         self.assertEqual(text, "\n\nFIRST\nSECOND\n")
         self.assertEqual(self.get_line_data("load.html"), [1, 2, 3, 4])
         self.assertEqual(self.get_analysis("load.html"), ([1, 2, 3, 4], []))
+
+    def test_load_with_extends(self):
+        self.make_template(name="base.html", text="""\
+            Hello
+            {% block second_line %}second{% endblock %}
+            Goodbye
+            """)
+
+        self.make_template(name="specific.html", text="""\
+            {% extends "base.html" %}
+            {% load i18n %}
+            {% block second_line %}
+            SPECIFIC
+            {% endblock %}
+            """)
+
+        text = self.run_django_coverage(name="specific.html")
+        self.assertEqual(text, "Hello\n\nSPECIFIC\n\nGoodbye\n")
+        self.assertEqual(self.get_line_data("specific.html"), [1, 4])
+        self.assertEqual(self.get_analysis("specific.html"), ([1, 4], []))