Travis: tweak test_script.sh (#8444)

lesteve · web-flow · commit fcb140313253 · 2017-02-23T14:55:28.000+01:00
* --with-coverage was repeated twice and nose-timer options were disabled
* make test-doc uses nosetests so skip if if USE_PYTEST is true
diff --git a/build_tools/travis/test_script.sh b/build_tools/travis/test_script.sh
@@ -24,7 +24,7 @@ run_tests() {
     if [[ "$USE_PYTEST" == "true" ]]; then
         TEST_CMD="pytest --showlocals --pyargs"
     else
-        TEST_CMD="nosetests --with-coverage" # --with-timer --timer-top-n 20"
+        TEST_CMD="nosetests --with-timer --timer-top-n 20"
     fi
     # Get into a temp directory to run test from the installed scikit learn and
     # check if we do not leave artifacts
@@ -43,9 +43,12 @@ run_tests() {
     fi
     $TEST_CMD sklearn
 
-    # Test doc
-    cd $OLDPWD
-    make test-doc
+    # Test doc (only with nose until we switch completely to pytest)
+    if [[ "$USE_PYTEST" != "true" ]]; then
+        # Going back to git checkout folder needed for make test-doc
+        cd $OLDPWD
+        make test-doc
+    fi
 }
 
 if [[ "$RUN_FLAKE8" == "true" ]]; then
