From 60f3d26643448a844f506c0b0cfc644e804b24a8 Mon Sep 17 00:00:00 2001 From: Chris Markiewicz Date: Sat, 17 Feb 2018 18:44:03 -0500 Subject: [PATCH 1/2] CI: Add doctests to pytest script --- docker/files/run_pytests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/files/run_pytests.sh b/docker/files/run_pytests.sh index 76935b42f8..d20fe625ba 100644 --- a/docker/files/run_pytests.sh +++ b/docker/files/run_pytests.sh @@ -26,7 +26,7 @@ fi # Run tests using pytest export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION} -py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml --cov nipype --cov-config /src/nipype/.coveragerc --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml ${TESTPATH} +py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml --cov nipype --cov-config /src/nipype/.coveragerc --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml --doctest-modules ${TESTPATH} exit_code=$? # Collect crashfiles From 5f365a659750c6a6d646ccf0baf27b162a14d9f9 Mon Sep 17 00:00:00 2001 From: "Christopher J. Markiewicz" Date: Sat, 17 Feb 2018 20:42:21 -0500 Subject: [PATCH 2/2] TEST: Use pytest.ini to enable doctests --- docker/files/run_pytests.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/files/run_pytests.sh b/docker/files/run_pytests.sh index d20fe625ba..24d9466f80 100644 --- a/docker/files/run_pytests.sh +++ b/docker/files/run_pytests.sh @@ -26,7 +26,10 @@ fi # Run tests using pytest export COVERAGE_FILE=${WORKDIR}/tests/.coverage.py${PYTHON_VERSION} -py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml --cov nipype --cov-config /src/nipype/.coveragerc --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml --doctest-modules ${TESTPATH} +py.test -v --junitxml=${WORKDIR}/tests/pytests_py${PYTHON_VERSION}.xml \ + --cov nipype --cov-config /src/nipype/.coveragerc \ + --cov-report xml:${WORKDIR}/tests/coverage_py${PYTHON_VERSION}.xml \ + -c ${TESTPATH}/pytest.ini ${TESTPATH} exit_code=$? # Collect crashfiles