Also need a decorator for maximum Django version

Author: nedbat

tests/plugin_test.py

@@ -175,15 +175,28 @@ def squashed(s):
     return re.sub(r"\s", "", s)
 
 
-def needs_django(*needed_version):
+def django_start_at(*needed_version):
     """A decorator for tests to require a minimum version of Django.
 
-    @needs_django(1, 8)     # Don't run the test on 1.7 or lower.
+    @django_start_at(1, 8)      # Don't run the test on 1.7 or lower.
     def test_thing(self):
         ...
 
     """
-    if django.VERSION >= tuple(needed_version):
+    if django.VERSION >= needed_version:
         return lambda func: func
     else:
         return unittest.skip("Django version must be newer")
+
+def django_stop_at(*needed_version):
+    """A decorator for tests to require a maximum version of Django.
+
+    @django_stop_at(1, 8)       # Don't run the test on 1.8 or higher.
+    def test_thing(self):
+        ...
+
+    """
+    if django.VERSION < needed_version:
+        return lambda func: func
+    else:
+        return unittest.skip("Django version must be older")

tests/test_extends.py

@@ -1,6 +1,6 @@
 """Tests of template inheritance for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, needs_django
+from .plugin_test import DjangoPluginTestCase, django_start_at
 
 
 class BlockTest(DjangoPluginTestCase):
@@ -146,7 +146,7 @@ def test_include(self):
 
 
 # {% ssi %} is in earlier Djangos than 1.5, but doesn't trace properly.
-@needs_django(1, 5)
+@django_start_at(1, 5)
 class SsiTest(DjangoPluginTestCase):
     """Test {% ssi %}, which does not trace the included file."""
 

tests/test_simple.py

@@ -1,7 +1,7 @@
 # coding: utf8
 """Simple tests for django_coverage_plugin."""
 
-from .plugin_test import DjangoPluginTestCase, needs_django
+from .plugin_test import DjangoPluginTestCase, django_start_at
 
 # TODO: test what happens if TEMPLATE_DEBUG is not set.
 
@@ -154,7 +154,7 @@ def test_firstof(self):
         self.assertEqual(text, "B\nB\nquux\n")
         self.assert_analysis([1, 2, 3])
 
-    @needs_django(1, 8)
+    @django_start_at(1, 8)
     def test_lorem(self):
         self.make_template("""\
             First
@@ -175,7 +175,7 @@ def test_now(self):
         self.assertEqual(text, "Now:\nnow\n.\n")
         self.assert_analysis([1, 2, 3])
 
-    @needs_django(1, 8)
+    @django_start_at(1, 8)
     def test_now_as(self):
         self.make_template("""\
             {% now "\\n\\o\\w" as right_now %}
@@ -195,7 +195,7 @@ def test_templatetag(self):
         self.assertEqual(text, "{%\nurl 'entry_list'\n%}\n")
         self.assert_analysis([1, 2, 3])
 
-    @needs_django(1, 5)     # 1.4 had different syntax for {% url %}
+    @django_start_at(1, 5)          # 1.4 had different syntax for {% url %}
     def test_url(self):
         self.make_template("""\
             {% url 'index' %}
@@ -205,7 +205,7 @@ def test_url(self):
         self.assertEqual(text, "/home\nnice.\n")
         self.assert_analysis([1, 2])
 
-    @needs_django(1, 5)     # {% verbatim %} is new in 1.5
+    @django_start_at(1, 5)          # {% verbatim %} is new in 1.5
     def test_verbatim(self):
         self.make_template("""\
             1