summaryrefslogtreecommitdiff
path: root/docs/topics
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2016-08-04 11:29:59 -0700
committerTim Graham <timograham@gmail.com>2016-08-05 17:41:49 -0400
commitbfd8f16fbdae1aeaa4d5076721238c041d582e82 (patch)
tree4560cab5dff4b16ddf23963cefbdc9dbeaf8c177 /docs/topics
parent0d82389adf7ac9f4ded571b5ab483444ef475c64 (diff)
[1.10.x] Edited docs of test.utils.setup/teardown_test_environment().
Backport of 42f9d65107692528583786a0695e26e2cbfc51a0 from master
Diffstat (limited to 'docs/topics')
-rw-r--r--docs/topics/testing/advanced.txt10
1 files changed, 4 insertions, 6 deletions
diff --git a/docs/topics/testing/advanced.txt b/docs/topics/testing/advanced.txt
index 754904e1d0..dacf858db2 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -545,15 +545,13 @@ utility methods in the ``django.test.utils`` module.
.. function:: setup_test_environment()
- Performs any global pre-test setup, such as the installing the
- instrumentation of the template rendering system and setting up
- the dummy email outbox.
+ Performs global pre-test setup, such as installing instrumentation for the
+ template rendering system and setting up the dummy email outbox.
.. function:: teardown_test_environment()
- Performs any global post-test teardown, such as removing the black
- magic hooks into the template system and restoring normal email
- services.
+ Performs global post-test teardown, such as removing instrumentation from
+ the template system and restoring normal email services.
``django.db.connection.creation``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~