Merge lp:~canonical-isd-hackers/canonical-identity-provider/test-script-coverage-fix into lp:canonical-identity-provider/release

[Ricardo Kirkner]

=== modified file 'scripts/test'
--- scripts/test	2010-04-21 15:29:24 +0000
+++ scripts/test	2010-05-06 12:26:26 +0000
@@ -6,15 +6,9 @@
 # HOWTO
 # ------
 #
-# This script can be run in two ways:
-#
-# 1. from within the configuration branch
-#
-#   config-unified$ /path/to/django-trunk/scripts/test
-#
-# 2. from within the code branch
-#
-#   django-trunk$ CONFIG_DIR=/path/to/config-unified ./scripts/test
+# This script is to be run like:
+#
+#   trunk$ ./scripts/test
 #
 # For the tests to work, both schemaconfig and django-settings have to be in
 # the PYTHONPATH
@@ -46,15 +40,11 @@
     test_specification="identityprovider"
 fi
 
-script_dir=$(readlink -f $(dirname $0))
-project_dir=$(readlink -f $(dirname $script_dir))
+CURRENT_DIR=$(readlink -f $(pwd))
+SCRIPT_DIR=$(readlink -f $(dirname $0))
+PROJECT_DIR=$(readlink -f $(dirname $SCRIPT_DIR))
 
-if [ "$CONFIG_DIR" != "" ]; then
-    config_dir=$CONFIG_DIR
-else
-    config_dir=$(readlink -f $(pwd))
-fi
-PYTHONPATH="$PYTHONPATH:$project_dir:$config_dir"
+PYTHONPATH="$PYTHONPATH:$PROJECT_DIR"
 
 if [ "$PYTHONPATH" != "" ]; then
     ENV="$ENV PYTHONPATH=$PYTHONPATH"
@@ -66,8 +56,17 @@
     export DJANGO_SETTINGS_MODULE=$DJANGO_SETTINGS_MODULE
 fi
 
+# make sure we are in the project folder
+if [ "$PROJECT_DIR" != "$CURRENT_DIR" ]; then
+	echo "This script has to be run from the project root folder."
+	echo "Please follow these steps:"
+	echo "cd $PROJECT_DIR"
+	echo "./scripts/test"
+	exit 2
+fi
 
-#rm .coverage*
+# get rid of old coverage files to get a clean report
+find . -name '.coverage*' -exec rm -f {} \;
 
 if [ "$doctest" = true ]
 then
@@ -75,9 +74,6 @@
     # without any prompting
     sudo date
 
-    # change to the project folder
-    cd $project_dir
-
     sudo $ENV `which python` wsgi_test_server.py &
     sso_pid=$!
 
@@ -94,24 +90,16 @@
     (cd doctests && python runner.py -m stories/api-authentications.txt)
     (cd doctests && python runner.py -m stories/api-workflows.txt)
     sudo kill $sso_pid
-
-    # change back to where we came from
-    cd -
-
 fi
 
 if [ "$unittest" = true ]
 then
-    # change to the configuration folder
-    cd $config_dir
     coverage run -p manage.py test $test_specification
-    # change back to where we came from
-    cd -
 fi
 
 # Creating nice (HTML) coverage report
-rm -rf $project_dir/coverage
+rm -rf $PROJECT_DIR/coverage
+OMIT="$VIRTUAL_ENV/lib,$VIRTUAL_ENV/src,.config,wsgi_test_server,identityprovider/tests,/usr/lib,settings,manage,urls"
 coverage combine
-coverage html -d $project_dir/coverage \
-    --omit=$VIRTUAL_ENV/lib,wsgi_test_server,identityprovider/tests,/usr/lib,settings,manage,urls
+coverage html -d $PROJECT_DIR/coverage --omit=$OMIT