Fixed #23421 -- Corrected TEST SERIALIZE setting.

Thanks gkoller for the report.

3 files changed, 24 insertions, 2 deletions

diff --git a/docs/ref/settings.txt b/docs/ref/settings.txt
index 5479afe82c..5cd362f07c 100644
--- a/docs/ref/settings.txt
+++ b/docs/ref/settings.txt
@@ -683,6 +683,19 @@ test database will use the name ``'test_' + DATABASE_NAME``.
 
 See :ref:`the-test-database`.
 
+.. setting:: TEST_SERIALIZE
+
+SERIALIZE
+^^^^^^^^^
+
+.. versionadded:: 1.7.1
+
+Boolean value to control whether or not the default test runnner serializes the
+database into an in-memory JSON string before running tests (used to restore
+the database state between tests if you don't have transactions). You can set
+this to ``False`` to speed up creation time if you don't have any test classes
+with :ref:`serialized_rollback=True <test-case-serialized-rollback>`.
+
 .. setting:: TEST_CREATE
 
 CREATE_DB
diff --git a/docs/releases/1.7.1.txt b/docs/releases/1.7.1.txt
index 2467da13bd..ceed11087b 100644
--- a/docs/releases/1.7.1.txt
+++ b/docs/releases/1.7.1.txt
@@ -70,3 +70,6 @@ Bugfixes
 
 * Made ``migrations.RunSQL`` no longer require percent sign escaping. This is
   now consistent with ``cursor.execute()`` (:ticket:`23426`).
+
+* Made the :setting:`SERIALIZE <TEST_SERIALIZE>` entry in the
+  :setting:`TEST <DATABASE-TEST>` dictionary usable (:ticket:`23421`).
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 46d0913084..cf50351a74 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -525,8 +525,14 @@ can be useful during testing.
     ``serialize`` determines if Django serializes the database into an
     in-memory JSON string before running tests (used to restore the database
     state between tests if you don't have transactions). You can set this to
-    False to significantly speed up creation time if you know you don't need
-    data persistence outside of test fixtures.
+    ``False`` to speed up creation time if you don't have any test classes
+    with :ref:`serialized_rollback=True <test-case-serialized-rollback>`.
+
+    .. versionadded:: 1.7.1
+
+        If you are using the default test runner, you can control this with the
+        the :setting:`SERIALIZE <TEST_SERIALIZE>` entry in the
+        :setting:`TEST <DATABASE-TEST>` dictionary
 
     ``keepdb`` determines if the test run should use an existing
     database, or create a new one. If ``True``, the existing