Refs #28478 -- Removed support for TestCase's allow_database_queries and multi_db per deprecation timeline.

4 files changed, 7 insertions, 29 deletions

diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index ce39f4fa3e..2fdf361af1 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -1091,9 +1091,8 @@ Miscellaneous
 
 * In order to enforce test isolation, database queries are not allowed
   by default in :class:`~django.test.SimpleTestCase` tests anymore. You
-  can disable this behavior by setting the
-  :attr:`~django.test.SimpleTestCase.allow_database_queries` class attribute
-  to ``True`` on your test class.
+  can disable this behavior by setting the ``allow_database_queries`` class
+  attribute to ``True`` on your test class.
 
 * ``ResolverMatch.app_name`` was changed to contain the full namespace path in
   the case of nested namespaces. For consistency with
diff --git a/docs/releases/2.2.txt b/docs/releases/2.2.txt
index 2639aa886a..3fb1f134fb 100644
--- a/docs/releases/2.2.txt
+++ b/docs/releases/2.2.txt
@@ -508,8 +508,8 @@ Miscellaneous
   first positional argument, if it accepts it. Support for overrides that don't
   accept it will be removed in Django 3.1.
 
-* The :attr:`.SimpleTestCase.allow_database_queries`,
-  :attr:`.TransactionTestCase.multi_db`, and :attr:`.TestCase.multi_db`
+* The ``SimpleTestCase.allow_database_queries``,
+  ``TransactionTestCase.multi_db``, and ``TestCase.multi_db``
   attributes are deprecated in favor of :attr:`.SimpleTestCase.databases`,
   :attr:`.TransactionTestCase.databases`, and :attr:`.TestCase.databases`.
   These new attributes allow databases dependencies to be declared in order to
diff --git a/docs/releases/3.1.txt b/docs/releases/3.1.txt
index d90a784fd9..3f7e7f261b 100644
--- a/docs/releases/3.1.txt
+++ b/docs/releases/3.1.txt
@@ -240,3 +240,6 @@ to remove usage of these features.
 * The ``FILE_CHARSET`` setting is removed.
 
 * ``django.contrib.staticfiles.storage.CachedStaticFilesStorage`` is removed.
+
+* Support for ``SimpleTestCase.allow_database_queries`` and
+  ``TransactionTestCase.multi_db`` is removed.
diff --git a/docs/topics/testing/tools.txt b/docs/topics/testing/tools.txt
index bc88e2defa..41652cbee1 100644
--- a/docs/topics/testing/tools.txt
+++ b/docs/topics/testing/tools.txt
@@ -747,14 +747,6 @@ If your tests make any database queries, use subclasses
     setting the ``databases`` class attribute to ``'__all__'`` on your test
     class.
 
-.. attribute:: SimpleTestCase.allow_database_queries
-
-    .. deprecated:: 2.2
-
-    This attribute is deprecated in favor of :attr:`databases`. The previous
-    behavior of ``allow_database_queries = True`` can be achieved by setting
-    ``databases = '__all__'``.
-
 .. warning::
 
     ``SimpleTestCase`` and its subclasses (e.g. ``TestCase``, ...) rely on
@@ -1180,14 +1172,6 @@ only loaded into the ``default`` database.
 Queries against databases not in ``databases`` will give assertion errors to
 prevent state leaking between tests.
 
-.. attribute:: TransactionTestCase.multi_db
-
-.. deprecated:: 2.2
-
-This attribute is deprecated in favor of :attr:`~TransactionTestCase.databases`.
-The previous behavior of ``multi_db = True`` can be achieved by setting
-``databases = '__all__'``.
-
 .. attribute:: TestCase.databases
 
 By default, only the ``default`` database will be wrapped in a transaction
@@ -1210,14 +1194,6 @@ This test will only allow queries against the ``other`` database. Just like for
 ``'__all__'`` constant can be used to specify that the test should allow
 queries to all databases.
 
-.. attribute:: TestCase.multi_db
-
-.. deprecated:: 2.2
-
-This attribute is deprecated in favor of :attr:`~TestCase.databases`. The
-previous behavior of ``multi_db = True`` can be achieved by setting
-``databases = '__all__'``.
-
 .. _overriding-settings:
 
 Overriding settings