Fix merge conflict in prev_next.html

[mediagoblin.git] / runtests.sh

diff --git a/runtests.sh b/runtests.sh
index 9b96b17cc6471b0d5bba7b3dfe3262fdfeaabbf0..94e77da223373155cebfa4bfdd098d86b9616e6a 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -23,8 +23,9 @@ elif which nosetests > /dev/null; then
     echo "Using nosetests from \$PATH";
     export NOSETESTS="nosetests";
 else
-    echo "No nosetests found, exiting! X_X";
+    echo "nosetests not found.  X_X";
+    echo "Please install 'nose'.  Exiting.";
     exit 1
 fi
 
-CELERY_CONFIG_MODULE=mediagoblin.celery_setup.from_tests $NOSETESTS $@
+CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_tests $NOSETESTS $@