Author: Armin Rigo <ar...@tunes.org> Branch: Changeset: r55492:ac392fb76904 Date: 2012-06-08 07:55 +0200 http://bitbucket.org/pypy/pypy/changeset/ac392fb76904/
Log: Document pytest.py like I documented test_all.py. diff --git a/pypy/test_all.py b/pypy/test_all.py --- a/pypy/test_all.py +++ b/pypy/test_all.py @@ -3,9 +3,16 @@ PyPy Test runner interface -------------------------- -Running test_all.py is equivalent to running py.test -which you independently install, see -http://pytest.org/getting-started.html +Running pytest.py starts py.test, the testing tool +we use in PyPy. It is distributed along with PyPy, +but you may get more information about it at +http://pytest.org/. + +Note that it makes no sense to run all tests at once. +You need to pick a particular subdirectory and run + + cd pypy/.../test + ../../../pytest.py [options] For more information, use test_all.py -h. """ diff --git a/pytest.py b/pytest.py --- a/pytest.py +++ b/pytest.py @@ -1,6 +1,20 @@ #!/usr/bin/env python """ -unit and functional testing with Python. +PyPy Test runner interface +-------------------------- + +Running pytest.py starts py.test, the testing tool +we use in PyPy. It is distributed along with PyPy, +but you may get more information about it at +http://pytest.org/. + +Note that it makes no sense to run all tests at once. +You need to pick a particular subdirectory and run + + cd pypy/.../test + ../../../pytest.py [options] + +For more information, use pytest.py -h. """ __all__ = ['main'] @@ -23,6 +37,11 @@ from _pytest import __version__ if __name__ == '__main__': # if run as a script or by 'python -m pytest' + import os + if len(sys.argv) == 1 and os.path.dirname(sys.argv[0]) in '.': + print >> sys.stderr, __doc__ + sys.exit(2) + #XXX: sync to upstream later import pytest_cov raise SystemExit(main(plugins=[pytest_cov])) _______________________________________________ pypy-commit mailing list pypy-commit@python.org http://mail.python.org/mailman/listinfo/pypy-commit
