diff options
| -rwxr-xr-x | runtests.sh | 20 | ||||
| -rw-r--r-- | setup.py | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/runtests.sh b/runtests.sh index fd19caf8..cd53da2d 100755 --- a/runtests.sh +++ b/runtests.sh @@ -26,14 +26,14 @@ then exit 1 fi -if [ -x "$basedir/bin/nosetests" ]; then - export NOSETESTS="$basedir/bin/nosetests"; - echo "Using $NOSETESTS"; -elif which nosetests > /dev/null; then - echo "Using nosetests from \$PATH"; - export NOSETESTS="nosetests"; +if [ -x "$basedir/bin/py.test" ]; then + export PYTEST="$basedir/bin/py.test"; + echo "Using $PYTEST"; +elif which py.test > /dev/null; then + echo "Using py.test from \$PATH"; + export PYTEST="py.test"; else - echo "nosetests not found. X_X"; + echo "py.test not found. X_X"; echo "Please install 'nose'. Exiting."; exit 1 fi @@ -45,7 +45,7 @@ echo "+ CELERY_CONFIG_MODULE=$CELERY_CONFIG_MODULE" # Look to see if the user has specified a specific directory/file to # run tests out of. If not we'll need to pass along -# mediagoblin/tests/ later very specifically. Otherwise nosetests +# mediagoblin/tests/ later very specifically. Otherwise py.test # will try to read all directories, and this turns into a mess! need_arg=1 @@ -61,8 +61,8 @@ if [ "$need_arg" = 1 ] then testdir="$basedir/mediagoblin/tests" set -x - exec "$NOSETESTS" "$@" "$testdir" + exec "$PYTEST" "$@" "$testdir" --boxed else set -x - exec "$NOSETESTS" "$@" + exec "$PYTEST" "$@" --boxed fi @@ -46,7 +46,7 @@ setup( 'beaker', 'wtforms', 'py-bcrypt', - 'nose', + 'pytest', 'werkzeug>=0.7', 'celery==2.5.3', 'kombu==2.1.7', |