summaryrefslogtreecommitdiff
path: root/docs/topics/testing
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:38:49 -0400
commit42f9d65107692528583786a0695e26e2cbfc51a0 (patch)
tree479f3d74f3e1f2a6c442eb9c0fb96702c7852316 /docs/topics/testing
parentcdf54db6c52609911d7ea2af472ee340919e5994 (diff)
Edited docs of test.utils.setup/teardown_test_environment().
Diffstat (limited to 'docs/topics/testing')
-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 8cfb82db67..7127657cfc 100644
--- a/docs/topics/testing/advanced.txt
+++ b/docs/topics/testing/advanced.txt
@@ -607,15 +607,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``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~