diff --git a/requirements.check b/requirements.check index ebe707bba..9ce1fe6a5 100644 --- a/requirements.check +++ b/requirements.check @@ -1,4 +1,4 @@ -nose +nose2 mock mypy==0.750 # fixme: when isort 5.0 is released, switch to pypy diff --git a/tools/tests.sh b/tools/tests.sh index b6fe8f12c..40c8f8b27 100755 --- a/tools/tests.sh +++ b/tools/tests.sh @@ -10,11 +10,7 @@ set -e BIN="$(cd "`dirname "$0"`"; pwd)" export PYTHONPATH=${BIN}/..:${PYTHONPATH} -# favour nosetests3 if available -nose=nosetests -if which nosetests3 >/dev/null 2>&1; then - nose=nosetests3 -fi +nose="python -m nose2 --plugin=nose2.plugins.mp -N 16" dir=. @@ -24,7 +20,4 @@ else lim="tests.test_$1" fi -if [ x$coverage != x ]; then - args="--with-coverage" -fi -(cd $dir && $nose -s --processes=16 --process-timeout=300 $lim $args --cover-package=anki) +(cd $dir && $nose $lim $args)