openstack/aodh
Code Issues Proposed changes

Add clean_exit for py-pgsql unit tests

Browse Source 
Currently, py-pgsql env doesn't stop postgresql daemon if
tests fails. In this patchset clean_exit function for postgresql
have been added.

Change-Id: If93d261108b2536ce92e15598a56d6cd8267b1fd
Closes-bug: 1423524
This commit is contained in:
Ilya Tyaptin 2015-02-19 15:25:54 +03:00
parent 3ad53cc903
commit df5cc17c9b
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
setup-test-env-postgresql.sh
View File

@ -8,22 +8,27 @@ if [ "$1" = "--coverage" ]; then
shift
fi
function clean_exit_pgsql(){
ret=$?
${1}/pg_ctl -w -D ${2} -o "-p ${3}" stop
rm -rf ${2}
return ${ret}
}
#export PATH=${PATH:+$PATH:}/sbin:/usr/sbin
check_for_cmd pg_config
# Start PostgreSQL process for tests
PGSQL_DATA=`mktemp -d /tmp/CEILO-PGSQL-XXXXX`
PGSQL_DATA=`mktemp -d CEILO-PGSQL-XXXXX`
PGSQL_PATH=`pg_config --bindir`
PGSQL_PORT=9823
${PGSQL_PATH}/initdb -E UTF8 ${PGSQL_DATA}
trap "clean_exit_pgsql ${PGSQL_PATH} ${PGSQL_DATA} ${PGSQL_PORT}" EXIT
LANGUAGE=C ${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-N 100 -F -k ${PGSQL_DATA} -p ${PGSQL_PORT}" start
export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1"
# Yield execution to venv command
$*
ret=$?
${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-p ${PGSQL_PORT}" stop
rm -rf ${PGSQL_DATA}
exit ${ret}
$*