fix failing tests

Author: oesteban

.coveragerc

@@ -1,5 +1,6 @@
 [run]
 branch = True
+data_file = .coverage
 source = nipype/
 omit =
     external/*

docker/files/run_examples.sh

@@ -17,7 +17,9 @@ echo "log_to_file = true" >> ${HOME}/.nipype/nipype.cfg
 echo "log_directory = ${WORKDIR}/logs/example_${example_id}" >> ${HOME}/.nipype/nipype.cfg
 
 # Set up coverage
+export COVERAGE_PROCESS_START=/src/nipype/.coveragerc
 sed -i -E "s/(source = ).*'/\1\/src\/nipype\/nipype/" /src/nipype/.coveragerc
+sed -i -E "s/(data_file = ).*'/\1\/\/work\/.coverage/" /src/nipype/.coveragerc
 
 if [ "$2" == "MultiProc" ]; then
 	echo "concurrency = multiprocessing" >> /src/nipype/.coveragerc
@@ -26,6 +28,6 @@ fi
 coverage run --rcfile=/src/nipype/.coveragerc /src/nipype/tools/run_examples.py $@
 exit_code=$?
 
-coverage xml -o ${WORKDIR}/smoketest_${example_id}.xml || true
+coverage xml --rcfile=/src/nipype/.coveragerc -o ${WORKDIR}/smoketest_${example_id}.xml || true
 
 exit $exit_code

nipype/utils/tests/test_cmd.py

@@ -12,7 +12,6 @@
 from ...utils import nipype_cmd
 
 PY3 = sys.version_info[0] >= 3
-PY2 = sys.version_info[0] < 2
 
 @contextmanager
 def capture_sys_output():
@@ -35,20 +34,11 @@ def test_main_returns_2_on_empty(self):
 
         exit_exception = cm.value
         assert exit_exception.code == 2
-
-        if PY2:
-            assert stderr.getvalue() == \
-                """usage: nipype_cmd [-h] module interface
+        assert stderr.getvalue() == \
+            """usage: nipype_cmd [-h] module interface
 nipype_cmd: error: too few arguments
-"""
-        elif PY3:
-            assert stderr.getvalue() == \
-                """usage: nipype_cmd [-h] module interface
-nipype_cmd: error: the following arguments are required: module, interface
 """
 
-        assert stdout.getvalue() == ''
-
     def test_main_returns_0_on_help(self):
         with pytest.raises(SystemExit) as cm:
             with capture_sys_output() as (stdout, stderr):
@@ -115,12 +105,7 @@ def test_run_4d_realign_without_arguments(self):
                                                        in_file [in_file ...]
                                                        tr"""
 
-        if PY3:
-            error_message += """
-nipype_cmd nipype.interfaces.nipy FmriRealign4d: error: the following arguments are required: in_file, tr
-"""
-        else:
-            error_message += """
+        error_message += """
 nipype_cmd nipype.interfaces.nipy FmriRealign4d: error: too few arguments
 """