Run py.test in tox.ini

This commit is contained in:
Takafumi Arakaki
2013-03-12 07:05:30 +01:00
parent a993dd0da4
commit 51a094be02
2 changed files with 7 additions and 6 deletions

2
pytest.ini Normal file
View File

@@ -0,0 +1,2 @@
[pytest]
addopts = --assert=plain

11
tox.ini
View File

@@ -4,13 +4,12 @@ envlist = py25, py26, py27, py32
setenv = setenv =
XDG_CACHE_HOME={envtmpdir}/cache XDG_CACHE_HOME={envtmpdir}/cache
deps = deps =
nose pytest
commands = commands =
python regression.py py.test []
python run.py # Doctests can't be run with the main tests because then py.test
python refactor.py # tries to import broken python files under test/*/.
nosetests --with-doctest --doctest-tests {toxinidir}/jedi py.test --doctest-modules {toxinidir}/jedi
changedir = test
[testenv:py25] [testenv:py25]
deps = deps =
simplejson simplejson