summaryrefslogtreecommitdiff
path: root/docs/topics/testing
diff options
context:
space:
mode:
Diffstat (limited to 'docs/topics/testing')
-rw-r--r--docs/topics/testing/advanced.txt7
-rw-r--r--docs/topics/testing/overview.txt3
2 files changed, 6 insertions, 4 deletions
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 5a991598d0..ae0e78ce8e 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -504,12 +504,11 @@ can be useful during testing.
* If autoclobber is ``True``, the database will be destroyed
without consulting the user.
-
``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 persistance outside of test fixtures.
+ data persistence outside of test fixtures.
Returns the name of the test database that it created.
@@ -517,6 +516,10 @@ can be useful during testing.
:setting:`NAME` in :setting:`DATABASES` to match the name of the test
database.
+ .. versionchanged:: 1.7
+
+ The ``serialize`` argument was added.
+
.. function:: destroy_test_db(old_database_name, [verbosity=1])
Destroys the database whose name is the value of :setting:`NAME` in
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 0fa158172d..1c3b6d5df6 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -251,7 +251,7 @@ tests and not in ``TransactionTestCase`` tests, and additionally only on
backends where transactions are supported (the most important exception being
MyISAM).
-Django can re-load that data for you on a per-testcase basis by
+Django can reload that data for you on a per-testcase basis by
setting the ``serialized_rollback`` option to ``True`` in the body of the
``TestCase`` or ``TransactionTestCase``, but note that this will slow down
that test suite by approximately 3x.
@@ -283,7 +283,6 @@ used. This behavior `may change`_ in the future.
.. _may change: https://code.djangoproject.com/ticket/11505
-
Understanding the test output
-----------------------------