Register ignore_template_errors marker

Fixes #609.
Closes #610.

Author: blueyed

docs/changelog.rst

@@ -1,7 +1,16 @@
 Changelog
 =========
 
-3.3.1 (2018-06-21)
+unreleased
+------------------
+
+Bug fixes
+^^^^^^^^^
+
+* Fixed registration of :py:func:`~pytest.mark.ignore_template_errors` marker,
+  which is required with ``pytest --strict`` (#609).
+
+3.3.2 (2018-06-21)
 ------------------
 
 Bug fixes

docs/helpers.rst

@@ -82,10 +82,12 @@ when trying to access the database.
 
 .. py:function:: pytest.mark.ignore_template_errors
 
-  If you run pytest using the ``--fail-on-template-vars`` option,
-  tests will fail should your templates contain any invalid variables.
-  This marker will disable this feature by setting ``settings.TEMPLATE_STRING_IF_INVALID=None``
-  or the ``string_if_invalid`` template option
+  Ignore errors when using the ``--fail-on-template-vars`` option, i.e.
+  do not cause tests to fail if your templates contain invalid variables.
+
+  This marker sets the ``string_if_invalid`` template option, or
+  the older ``settings.TEMPLATE_STRING_IF_INVALID=None`` (Django up to 1.10).
+  See :ref:`django:invalid-template-variables`.
 
   Example usage::
 

pytest_django/plugin.py

@@ -183,6 +183,10 @@ def pytest_load_initial_conftests(early_config, parser, args):
         'the `urls` attribute of Django `TestCase` objects.  *modstr* is '
         'a string specifying the module of a URL config, e.g. '
         '"my_app.test_urls".')
+    early_config.addinivalue_line(
+        'markers',
+        'ignore_template_errors(): ignore errors from invalid template '
+        'variables (if --fail-on-template-vars is used).')
 
     options = parser.parse_known_args(args)
 
@@ -500,7 +504,7 @@ def _fail_for_invalid_template_variable(request):
     It does not raise an exception, but fails, as the stack trace doesn't
     offer any helpful information to debug.
     This behavior can be switched off using the marker:
-    ``ignore_template_errors``
+    ``pytest.mark.ignore_template_errors``
     """
     class InvalidVarException(object):
         """Custom handler for invalid strings in templates."""