parallelize tests, fix paths, etc

Author: oesteban

.circle/codecov.sh

@@ -9,15 +9,23 @@ set -e         # Exit immediately if a command exits with a non-zero status.
 set -u         # Treat unset variables as an error when substituting.
 set -x         # Print command traces before executing command.
 
-mkdir -p ${CIRCLE_TEST_REPORTS}/unittests ${CIRCLE_TEST_REPORTS}/smoketest
-cp ${SCRATCH}/coverage*.xml ${CIRCLE_TEST_REPORTS}/unittests/
-cp ${SCRATCH}/smoketests*.xml ${CIRCLE_TEST_REPORTS}/smoketest/
+# Place py.test reports in folders
+for f in $( find $SCRATCH/ -name "pytest*.xml" ); do
+	folder=$( basename ${f:: -4} )
+	mkdir -p ${CIRCLE_TEST_REPORTS}/$folder
+	cp $f ${CIRCLE_TEST_REPORTS}/$folder/pytest.xml
+done
 
 # Send coverage data to codecov.io
 curl -so codecov.io https://codecov.io/bash
 chmod 755 codecov.io
 
-find "${CIRCLE_TEST_REPORTS}/unittests" -name '*.xml' -print0 | \
+find "${SCRATCH}/" -name 'coverage*.xml' -maxdepth 1 -print0 | \
   xargs -0 -I file ./codecov.io -f file -t "${CODECOV_TOKEN}" -F unittests
-find "${CIRCLE_TEST_REPORTS}/smoketest" -name '*.xml' -print0 | \
+find "${SCRATCH}/" -name 'smoketest*.xml' -maxdepth 1 -print0 | \
   xargs -0 -I file ./codecov.io -f file -t "${CODECOV_TOKEN}" -F smoketests
+
+# Place coverage in the correct folders
+mkdir -p ${CIRCLE_TEST_REPORTS}/unittests ${CIRCLE_TEST_REPORTS}/smoketest
+cp ${SCRATCH}/coverage*.xml ${CIRCLE_TEST_REPORTS}/unittests/ || true
+cp ${SCRATCH}/smoketest*.xml ${CIRCLE_TEST_REPORTS}/smoketest/ || true

docker/files/run_examples.sh

@@ -14,4 +14,4 @@ echo 'log_directory = /scratch/logs/' >> /root/.nipype/nipype.cfg
 coverage run /root/src/nipype/tools/run_examples.py $@
 arr=$@
 tmp_var=$( IFS=$' '; echo "${arr[*]}" )
-coverage xml -o "/scratch/smoketest_${tmp_var//[^A-Za-z0-9_-]/_}.xml"
+coverage xml -o "/scratch/smoketest_${tmp_var//[^A-Za-z0-9_-]/_}.xml"

docker/files/run_pytests.sh

@@ -6,7 +6,7 @@ set -u
 PYTHON_VERSION=$( python -c "import sys; print('{}{}'.format(sys.version_info[0], sys.version_info[1]))" )
 
 # Create necessary directories
-mkdir -p /scratch/pytest /scratch/crashfiles /scratch/logs/py${PYTHON_VERSION}
+mkdir -p /scratch/crashfiles /scratch/logs/py${PYTHON_VERSION}
 
 # Create a nipype config file
 mkdir -p /root/.nipype
@@ -23,15 +23,15 @@ fi
 # Run tests using pytest
 cd /root/src/nipype/
 make clean
-py.test --doctest-modules --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}.xml --cov=nipype nipype
+py.test -n ${CIRCLE_NCPUS:-4} --doctest-modules --junitxml=/scratch/pytests_py{PYTHON_VERSION}.xml --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}.xml --cov=nipype nipype
 
 
 # Workaround: run here the profiler tests in python 3
 if [[ "${PYTHON_VERSION}" -ge "30" ]]; then
     echo '[execution]' >> /root/.nipype/nipype.cfg
     echo 'profile_runtime = true' >> /root/.nipype/nipype.cfg
-    py.test --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}_profiler.xml --cov=nipype nipype/interfaces/tests/test_runtime_profiler.py 
-    py.test --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}_multiproc.xml --cov=nipype nipype/pipeline/plugins/tests/test_multiproc*.py 
+    py.test -n ${CIRCLE_NCPUS:-4} --junitxml=/scratch/pytests_py{PYTHON_VERSION}_profiler.xml --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}_profiler.xml --cov=nipype nipype/interfaces/tests/test_runtime_profiler.py
+    py.test -n ${CIRCLE_NCPUS:-4} --junitxml=/scratch/pytests_py{PYTHON_VERSION}_multiproc.xml --cov-report xml:/scratch/coverage_py${PYTHON_VERSION}_multiproc.xml --cov=nipype nipype/pipeline/plugins/tests/test_multiproc*.py
 fi
 
 # Copy crashfiles to scratch

nipype/info.py

@@ -151,6 +151,7 @@ def get_nipype_gitversion():
 TESTS_REQUIRES = [
     'pytest>=%s' % PYTEST_MIN_VERSION,
     'pytest-cov',
+    'pytest-xdist',
     'mock',
     'codecov',
     'dipy',