aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-11-25 10:44:07 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-11-25 10:44:07 -0500
commit63c3e2e1ba805f64ad251a90c1182bdd06e28a12 (patch)
treec566b4b1308faefdf854559a881ee93c07b210c2
parent75a571e4d9d5f5c3fde661c54a368b533be1978b (diff)
downloadexternal_python_setuptools-63c3e2e1ba805f64ad251a90c1182bdd06e28a12.tar.gz
external_python_setuptools-63c3e2e1ba805f64ad251a90c1182bdd06e28a12.tar.bz2
external_python_setuptools-63c3e2e1ba805f64ad251a90c1182bdd06e28a12.zip
Update tox tests so they run the full suite of tests using the canonical technique. Include .tox in norecursedirs to avoid testing all the dependencies and environment. Update docs to reflect findings (https://bitbucket.org/spookylukey/setuptools/commits/88339d2e4af661a60a42bc14c4ff3e68cd19fa21#comment-2558164).
-rw-r--r--docs/developer-guide.txt3
-rw-r--r--tox.ini6
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/developer-guide.txt b/docs/developer-guide.txt
index b6f5bb9f..ae33649b 100644
--- a/docs/developer-guide.txt
+++ b/docs/developer-guide.txt
@@ -94,7 +94,8 @@ The primary tests are run using py.test. To run the tests::
$ python setup.py test
-Or install py.test into your environment and run ``py.test``.
+Or install py.test into your environment and run ``PYTHONPATH=. py.test``
+or ``python -m pytest``.
Under continuous integration, additional tests may be run. See the
``.travis.yml`` file for full details on the tests run under Travis-CI.
diff --git a/tox.ini b/tox.ini
index 7aeffdd8..9061869f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,5 @@
[tox]
envlist = py26,py27,py31,py32,py33,py34
+
[testenv]
-deps=
- pytest
- mock
-commands=py.test setuptools {posargs}
+commands=python setup.py test