openstack/aodh
Code Issues Proposed changes

Ensure correct return code of run-tests.sh

Browse Source 
If 'kill -9 mongodb_pid' failed, run-tests.sh exit with a
return code of 0.

This change ensure that the return code is the one of the failed
command.

Change-Id: Iad58dac3fa66d1ea688af706940511033c1d76f7
This commit is contained in:
Mehdi Abaakouk 2013-07-15 19:01:49 +02:00 committed by Mehdi Abaakouk
parent be77b3412f
commit a8b4ff6b33
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
run-tests.sh
View File

@ -1,6 +1,15 @@
#!/bin/bash
set -e
function clean_exit(){
local error_code="$?"
rm -rf ${MONGO_DATA}
if [ "$MONGO_PID" ]; then
kill -9 ${MONGO_PID} || true
fi
return $error_code
}
if [ "$1" = "--coverage" ]; then
COVERAGE_ARG="$1"
shift
@ -14,9 +23,8 @@ fi
# Main unit tests
MONGO_DATA=`mktemp -d`
trap "rm -rf ${MONGO_DATA}" EXIT
trap "clean_exit" EXIT
mongod --maxConns 32 --smallfiles --quiet --noauth --port 29000 --dbpath "${MONGO_DATA}" --bind_ip localhost &
MONGO_PID=$!
trap "kill -9 ${MONGO_PID} || true" EXIT
export CEILOMETER_TEST_MONGODB_URL="mongodb://localhost:29000/ceilometer"
python setup.py testr --slowest --testr-args="--concurrency=1 $*" $COVERAGE_ARG