From 51a094be028d4275d1265792158a907506ccdecf Mon Sep 17 00:00:00 2001
From: Takafumi Arakaki <aka.tkf@gmail.com>
Date: Tue, 12 Mar 2013 07:05:30 +0100
Subject: [PATCH] Run py.test in tox.ini

---
 pytest.ini |  2 ++
 tox.ini    | 11 +++++------
 2 files changed, 7 insertions(+), 6 deletions(-)
 create mode 100644 pytest.ini

diff --git a/pytest.ini b/pytest.ini
new file mode 100644
index 00000000..2ce9da86
--- /dev/null
+++ b/pytest.ini
@@ -0,0 +1,2 @@
+[pytest]
+addopts = --assert=plain
diff --git a/tox.ini b/tox.ini
index 2a39e11c..afcc4cbf 100644
--- 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