Skip to content
Snippets Groups Projects
Commit fcb14031 authored by Loic Esteve's avatar Loic Esteve Committed by GitHub
Browse files

Travis: tweak test_script.sh (#8444)

* --with-coverage was repeated twice and nose-timer options were disabled
* make test-doc uses nosetests so skip if if USE_PYTEST is true
parent 159da2a7
Branches
No related tags found
No related merge requests found
...@@ -24,7 +24,7 @@ run_tests() { ...@@ -24,7 +24,7 @@ run_tests() {
if [[ "$USE_PYTEST" == "true" ]]; then if [[ "$USE_PYTEST" == "true" ]]; then
TEST_CMD="pytest --showlocals --pyargs" TEST_CMD="pytest --showlocals --pyargs"
else else
TEST_CMD="nosetests --with-coverage" # --with-timer --timer-top-n 20" TEST_CMD="nosetests --with-timer --timer-top-n 20"
fi fi
# Get into a temp directory to run test from the installed scikit learn and # Get into a temp directory to run test from the installed scikit learn and
# check if we do not leave artifacts # check if we do not leave artifacts
...@@ -43,9 +43,12 @@ run_tests() { ...@@ -43,9 +43,12 @@ run_tests() {
fi fi
$TEST_CMD sklearn $TEST_CMD sklearn
# 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 cd $OLDPWD
make test-doc make test-doc
fi
} }
if [[ "$RUN_FLAKE8" == "true" ]]; then if [[ "$RUN_FLAKE8" == "true" ]]; then
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment