summaryrefslogtreecommitdiff
path: root/docs/tutorials/wiki2/tests.rst
diff options
context:
space:
mode:
authorMichael Merickel <mmerickel@users.noreply.github.com>2016-04-12 17:56:53 -0500
committerMichael Merickel <mmerickel@users.noreply.github.com>2016-04-12 17:56:53 -0500
commit73cd1e62745fddee602e95837f155ffd499e51b7 (patch)
tree462e7bec14ef3f5531837f9ab7d1bfd2a3f4d797 /docs/tutorials/wiki2/tests.rst
parentfa43952e617ad68c52447da28fc7f5be23ff4b10 (diff)
parent39d7c8bb68a94cf29256ba5da463da0432b0233c (diff)
downloadpyramid-73cd1e62745fddee602e95837f155ffd499e51b7.tar.gz
pyramid-73cd1e62745fddee602e95837f155ffd499e51b7.tar.bz2
pyramid-73cd1e62745fddee602e95837f155ffd499e51b7.zip
Merge pull request #2468 from Pylons/docs/easy-install-to-pip.2104
Docs: easy install to pip
Diffstat (limited to 'docs/tutorials/wiki2/tests.rst')
-rw-r--r--docs/tutorials/wiki2/tests.rst16
1 files changed, 7 insertions, 9 deletions
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst
index 54aea28c6..97508168e 100644
--- a/docs/tutorials/wiki2/tests.rst
+++ b/docs/tutorials/wiki2/tests.rst
@@ -1,3 +1,5 @@
+.. _wiki2_adding_tests:
+
============
Adding Tests
============
@@ -75,30 +77,26 @@ follows:
Running the tests
=================
-We can run these tests by using ``setup.py test`` in the same way we did in
-:ref:`running_tests`:
+We can run these tests similarly to how we did in :ref:`running_tests`:
On UNIX:
.. code-block:: bash
- $ $VENV/bin/python setup.py test -q
+ $ $VENV/bin/py.test -q
On Windows:
.. code-block:: ps1con
- c:\pyramidtut\tutorial> %VENV%\Scripts\python setup.py test -q
+ c:\pyramidtut\tutorial> %VENV%\Scripts\py.test -q
The expected result should look like the following:
.. code-block:: text
- .....................
- ----------------------------------------------------------------------
- Ran 22 tests in 5.320s
-
- OK
+ ......................
+ 22 passed, 1 pytest-warnings in 5.81 seconds
.. note:: If you use Python 3 during this tutorial, you will see deprecation
warnings in the output, which we will choose to ignore. In making this