Run py.test in tox.ini

2025-12-06 22:14:27 +08:00 · 2013-03-12 07:05:30 +01:00
parent a993dd0da4
commit 51a094be02
2 changed files with 7 additions and 6 deletions
--- a/pytest.ini
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --assert=plain
--- a/tox.ini
+++ b/tox.ini
@@ -4,13 +4,12 @@ envlist = py25, py26, py27, py32
 setenv =
    XDG_CACHE_HOME={envtmpdir}/cache
 deps =
-    nose
+    pytest
 commands =
-    python regression.py
-    python run.py
-    python refactor.py
-    nosetests --with-doctest --doctest-tests {toxinidir}/jedi
-changedir = test
+    py.test []
+    # Doctests can't be run with the main tests because then py.test
+    # tries to import broken python files under test/*/.
+    py.test --doctest-modules {toxinidir}/jedi
 [testenv:py25]
 deps =
    simplejson