Run doctests in the main py.test run

pytest.ini

@@ -1,5 +1,8 @@
 [pytest]
-addopts = --assert=plain
+addopts = --assert=plain --doctest-modules
+
+# Ignore broken files in blackbox test directories
+norecursedirs = .* completion refactor
 
 # Activate `clean_jedi_cache` fixture for all tests.  This should be
 # fine as long as we are using `clean_jedi_cache` as a session scoped

tox.ini

@@ -5,9 +5,6 @@ deps =
     pytest
 commands =
     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