fix issue493: don't run tests in doc directory with ``python setup.py test``

(use tox -e doctesting for that)
This commit is contained in:
holger krekel 2014-04-02 12:48:35 +02:00
parent 83a3cc9c94
commit 36288c5134
3 changed files with 11 additions and 2 deletions

View File

@ -42,6 +42,9 @@ NEXT (2.6)
- fix issue492: avoid leak in test_writeorg. Thanks Marc Abramowitz. - fix issue492: avoid leak in test_writeorg. Thanks Marc Abramowitz.
- fix issue493: don't run tests in doc directory with ``python setup.py test``
(use tox -e doctesting for that)
2.5.2 2.5.2
----------------------------------- -----------------------------------

View File

@ -75,7 +75,7 @@ class PyTest(Command):
PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x] PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x]
PPATH.insert(0, os.getcwd()) PPATH.insert(0, os.getcwd())
os.environ["PYTHONPATH"] = ":".join(PPATH) os.environ["PYTHONPATH"] = ":".join(PPATH)
errno = subprocess.call([sys.executable, 'pytest.py']) errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc'])
raise SystemExit(errno) raise SystemExit(errno)
if __name__ == '__main__': if __name__ == '__main__':

View File

@ -1,6 +1,6 @@
[tox] [tox]
distshare={homedir}/.tox/distshare distshare={homedir}/.tox/distshare
envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial,doctesting
[testenv] [testenv]
changedir=testing changedir=testing
@ -92,6 +92,12 @@ commands=
make clean make clean
make html make html
[testenv:doctesting]
basepython=python3.3
changedir=doc/en
deps=PyYAML
commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml []
[testenv:regen] [testenv:regen]
basepython=python basepython=python
changedir=doc/en changedir=doc/en