Fix #1064 - Add major and minor feed for outbox/feed

[mediagoblin.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index cd53da2df9ad5a21f45045f24fb005037ee1058e..e25239612862b7bbcfb97b65a7dd47f68f5a2474 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -34,24 +34,27 @@ elif which py.test > /dev/null; then
     export PYTEST="py.test";
 else
     echo "py.test not found.  X_X";
-    echo "Please install 'nose'.  Exiting.";
+    echo "Please install pytest e.g. with 'pip install pytest'.  Exiting.";
     exit 1
 fi
 
 
-CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests
-export CELERY_CONFIG_MODULE
-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 py.test
 # will try to read all directories, and this turns into a mess!
 
 need_arg=1
+ignore_next=0
 for i in "$@"
 do
+  if [ "$ignore_next" = 1 ]
+  then
+    ignore_next=0
+    continue
+  fi
   case "$i" in
+    -n) ignore_next=1;;
     -*) ;;
     *) need_arg=0; break ;;
   esac