Show More
@@ -463,10 +463,6 b' def run_iptest():' | |||||
463 |
|
463 | |||
464 |
|
464 | |||
465 | argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks |
|
465 | argv = sys.argv + [ '--detailed-errors', # extra info in tracebacks | |
466 |
|
||||
467 | '--with-ipdoctest', |
|
|||
468 | '--ipdoctest-tests','--ipdoctest-extension=txt', |
|
|||
469 |
|
||||
470 | # We add --exe because of setuptools' imbecility (it |
|
466 | # We add --exe because of setuptools' imbecility (it | |
471 | # blindly does chmod +x on ALL files). Nose does the |
|
467 | # blindly does chmod +x on ALL files). Nose does the | |
472 | # right thing and it tries to avoid executables, |
|
468 | # right thing and it tries to avoid executables, | |
@@ -489,11 +485,19 b' def run_iptest():' | |||||
489 | # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it. |
|
485 | # for nose >= 0.11, though unfortunately nose 0.10 doesn't support it. | |
490 | argv.append('--traverse-namespace') |
|
486 | argv.append('--traverse-namespace') | |
491 |
|
487 | |||
492 | # use our plugin for doctesting. It will remove the standard doctest plugin |
|
488 | plugins = [ ExclusionPlugin(section.excludes), KnownFailure(), | |
493 | # if it finds it enabled |
|
|||
494 | plugins = [ExclusionPlugin(section.excludes), IPythonDoctest(), KnownFailure(), |
|
|||
495 | SubprocessStreamCapturePlugin() ] |
|
489 | SubprocessStreamCapturePlugin() ] | |
496 |
|
490 | |||
|
491 | # we still have some vestigial doctests in core | |||
|
492 | if (section.name.startswith(('core', 'IPython.core'))): | |||
|
493 | plugins.append(IPythonDoctest()) | |||
|
494 | argv.extend([ | |||
|
495 | '--with-ipdoctest', | |||
|
496 | '--ipdoctest-tests', | |||
|
497 | '--ipdoctest-extension=txt', | |||
|
498 | ]) | |||
|
499 | ||||
|
500 | ||||
497 | # Use working directory set by parent process (see iptestcontroller) |
|
501 | # Use working directory set by parent process (see iptestcontroller) | |
498 | if 'IPTEST_WORKING_DIR' in os.environ: |
|
502 | if 'IPTEST_WORKING_DIR' in os.environ: | |
499 | os.chdir(os.environ['IPTEST_WORKING_DIR']) |
|
503 | os.chdir(os.environ['IPTEST_WORKING_DIR']) |
General Comments 0
You need to be logged in to leave comments.
Login now