summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorSteve Piercy <web@stevepiercy.com>2014-10-07 00:07:09 -0700
committerSteve Piercy <web@stevepiercy.com>2014-10-07 00:07:09 -0700
commit03b469479c6a70d89cf18b2fdc91c223c9f6197a (patch)
tree1b3e4f0e9799331a383385f67b906575612cf152 /docs
parent159105a203dc62ef6306fb3537caab42bca0df8e (diff)
parent34e9381a628d4e5d061d8fe902579a9b9b9cb33c (diff)
downloadpyramid-03b469479c6a70d89cf18b2fdc91c223c9f6197a.tar.gz
pyramid-03b469479c6a70d89cf18b2fdc91c223c9f6197a.tar.bz2
pyramid-03b469479c6a70d89cf18b2fdc91c223c9f6197a.zip
Merge pull request #1424 from stevepiercy/master
Cherry pick 1.5 branch onto master
Diffstat (limited to 'docs')
-rw-r--r--docs/quick_tutorial/functional_testing.rst7
1 files changed, 5 insertions, 2 deletions
diff --git a/docs/quick_tutorial/functional_testing.rst b/docs/quick_tutorial/functional_testing.rst
index 205ddf5cb..09b05b0bc 100644
--- a/docs/quick_tutorial/functional_testing.rst
+++ b/docs/quick_tutorial/functional_testing.rst
@@ -37,12 +37,15 @@ Steps
$ $VENV/bin/python setup.py develop
$ $VENV/bin/easy_install webtest
-#. Let's extend ``unit_testing/tutorial/tests.py`` to include a
+#. Let's extend ``functional_testing/tutorial/tests.py`` to include a
functional test:
.. literalinclude:: functional_testing/tutorial/tests.py
:linenos:
+ Be sure this file is not executable, or ``nosetests`` may not
+ include your tests.
+
#. Now run the tests:
.. code-block:: bash
@@ -67,4 +70,4 @@ execution time of our tests.
Extra Credit
============
-#. Why do our functional tests use ``b''``? \ No newline at end of file
+#. Why do our functional tests use ``b''``?