include coverage file, roll back examples to linear

Author: oesteban

.noserc

@@ -1,11 +1,10 @@
 [nosetests]
 verbosity=3
 
+logging-level=DEBUG
+with-doctest=1
+with-xunit=1
 with-coverage=1
 cover-branches=1
 cover-xml=1
-cover-xml-file=./coverage.xml
 cover-min-percentage=50
-
-
-with-xunit=1

circle.yml

@@ -19,13 +19,13 @@ dependencies:
 test:
   override:
     - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch --entrypoint="/usr/bin/run_builddocs.sh" nipype/testbench
-    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench test_spm MultiProc /root/examples/ workflow3d workflow4d :
+    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench test_spm Linear /root/examples/ workflow3d workflow4d :
         timeout: 1600
-    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_fsl_feeds MultiProc /root/examples/ l1pipeline
-    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_spm_dartel MultiProc /root/examples/ level1 l2pipeline :
+    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_fsl_feeds Linear /root/examples/ l1pipeline
+    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_spm_dartel Linear /root/examples/ level1 l2pipeline :
         timeout: 1600
-    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_fsl_reuse MultiProc /root/examples/ level1_workflow
-    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_spm_nested MultiProc /root/examples/ level1 l2pipeline
+    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_fsl_reuse Linear /root/examples/ level1_workflow
+    - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch nipype/testbench fmri_spm_nested Linear /root/examples/ level1 l2pipeline
     - docker run -i -v /etc/localtime:/etc/localtime:ro -v ~/scratch:/scratch -w /scratch --entrypoint="/usr/bin/run_nosetests.sh" nipype/testbench :
         timeout: 2600
   post:
@@ -34,7 +34,6 @@ test:
 general:
   artifacts:
     - "~/docs"
-#    - "coverage.xml"
-#     - "doc/_build/html"
-#     - "~/log.txt"
-#    - "nosetests.xml"
+    - "~/coverage.xml"
+    - "~/nosetests.xml"
+    - "~/builddocs.log"

docker/circleci/run_nosetests.sh

@@ -5,6 +5,7 @@ done
 source activate nipypetests-2.7
 cd /root/src/nipype
 mkdir -p /scratch/nose
-nosetests --with-doctest -c /root/src/nipype/.noserc --logging-level=DEBUG --verbosity=3 --xunit-file="/scratch/nosetests.xml"
+nosetests -c /root/src/nipype/.noserc --xunit-file="/scratch/nosetests.xml" --cover-xml-file="/scratch/coverage.xml"
 chmod 777 /scratch/nosetests.xml
+chmod 777 /scratch/coverage.xml
 chmod 777 -R /scratch/nose

docker/circleci/teardown.sh

@@ -7,7 +7,8 @@ set -u
 set -e
 
 mkdir -p ${CIRCLE_TEST_REPORTS}/nose
-sudo mv ~/scratch/nosetests.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
+sudo cp ~/scratch/nosetests.xml ${CIRCLE_TEST_REPORTS}/nose/${CIRCLE_PROJECT_REPONAME}.xml
+sudo mv ~/scratch/coverage.xml ~/coverage.xml
 mkdir -p ~/docs
 sudo mv ~/scratch/docs/* ~/docs/
-sudo mv ~/scratch/builddocs.log ~/docs/log.txt
+sudo mv ~/scratch/builddocs.log ~/builddocs.log