summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorCasey Duncan <casey.duncan@gmail.com>2011-01-16 14:11:31 -0700
committerCasey Duncan <casey.duncan@gmail.com>2011-01-16 14:11:31 -0700
commit0c4058fa1549d145e28a870a42d312770a597c9a (patch)
tree6254a6cb123ed15d3cbf112e37f6b4dcf881e017 /docs
parent496cb6fc2e7e28c4f583590b1a97bb5118b0049b (diff)
downloadpyramid-0c4058fa1549d145e28a870a42d312770a597c9a.tar.gz
pyramid-0c4058fa1549d145e28a870a42d312770a597c9a.tar.bz2
pyramid-0c4058fa1549d145e28a870a42d312770a597c9a.zip
move however for better flow
Diffstat (limited to 'docs')
-rw-r--r--docs/narr/testing.rst15
1 files changed, 8 insertions, 7 deletions
diff --git a/docs/narr/testing.rst b/docs/narr/testing.rst
index 08c6e355b..5aa752557 100644
--- a/docs/narr/testing.rst
+++ b/docs/narr/testing.rst
@@ -87,14 +87,15 @@ local` stack, which makes the ``get_current_*`` functions work. It returns a
required by the code under test. :func:`~pyramid.testing.tearDown` pops the
thread local stack.
-Normally when a Configurator is used directly with the ``main`` block of a
-Pyramid application, it defers performing any "real work" until its
+Normally when a Configurator is used directly with the ``main`` block of
+a Pyramid application, it defers performing any "real work" until its
``.commit`` method is called (often implicitly by the
-:meth:`pyramid.config.Configurator.make_wsgi_app` method). The Configurator
-returned by :func:`~pyramid.testing.setUp` is however an *autocommitting*
-Configurator which performs all actions implied by methods called on it
-immediately. This is more convenient for unit-testing purposes than needing
-to call :meth:`pyramid.config.Configurator.commit` in each test after adding
+:meth:`pyramid.config.Configurator.make_wsgi_app` method). The
+Configurator returned by :func:`~pyramid.testing.setUp` is an
+*autocommitting* Configurator, however, which performs all actions
+implied by methods called on it immediately. This is more convenient
+for unit-testing purposes than needing to call
+:meth:`pyramid.config.Configurator.commit` in each test after adding
extra configuration statements.
The use of the :func:`~pyramid.testing.setUp` and