summaryrefslogtreecommitdiff
path: root/docs/topics/testing
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2014-06-09 12:09:16 -0400
committerTim Graham <timograham@gmail.com>2014-06-09 12:09:16 -0400
commitc17cd151d855ca1b8fcec894c5fccaa4a05be512 (patch)
treea3135906c281b9a6765e3d1006075509bc58b3a8 /docs/topics/testing
parent4b25ebf112d8bf4fcee6ee8339913bffdc81035d (diff)
Doc edits for refs #22487.
Diffstat (limited to 'docs/topics/testing')
-rw-r--r--docs/topics/testing/advanced.txt2
-rw-r--r--docs/topics/testing/overview.txt3
2 files changed, 2 insertions, 3 deletions
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 8e9337b9b4..ac6e15557a 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -505,7 +505,7 @@ can be useful during testing.
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.
``keepdb`` determines if the test run should use an existing
database, or create a new one. If ``True``, the existing
diff --git a/docs/topics/testing/overview.txt b/docs/topics/testing/overview.txt
index 026bbd8c88..3556cb1559 100644
--- a/docs/topics/testing/overview.txt
+++ b/docs/topics/testing/overview.txt
@@ -244,7 +244,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.
@@ -276,7 +276,6 @@ used. This behavior `may change`_ in the future.
.. _may change: https://code.djangoproject.com/ticket/11505
-
Understanding the test output
-----------------------------