openstack/aodh
Code Issues Proposed changes

Be explicit about using /tmp for temporary datafiles

Browse Source 
If TMPDIR is not set, different version of mktemp will behave
differently. To be sure, best to be explicit.

Change-Id: Id92eb4e5b833a1c0859a0c6d68cfc2f4e1f6977f
This commit is contained in:
Chris Dent 2015-02-19 17:02:20 +00:00
parent df5cc17c9b
commit bdec0f2a2b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup-test-env-mongodb.sh
View File

@ -12,7 +12,7 @@ export PATH=${PATH:+$PATH:}/sbin:/usr/sbin
check_for_cmd mongod check_for_cmd mongod
# Start MongoDB process for tests # Start MongoDB process for tests
MONGO_DATA=`mktemp -d CEILO-MONGODB-XXXXX` MONGO_DATA=`mktemp -d /tmp/CEILO-MONGODB-XXXXX`
MONGO_PORT=29000 MONGO_PORT=29000
trap "clean_exit ${MONGO_DATA}" EXIT trap "clean_exit ${MONGO_DATA}" EXIT
mkfifo ${MONGO_DATA}/out mkfifo ${MONGO_DATA}/out

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

@ -21,7 +21,7 @@ function clean_exit_pgsql(){
check_for_cmd pg_config check_for_cmd pg_config
# Start PostgreSQL process for tests # Start PostgreSQL process for tests
PGSQL_DATA=`mktemp -d CEILO-PGSQL-XXXXX` PGSQL_DATA=`mktemp -d /tmp/CEILO-PGSQL-XXXXX`
PGSQL_PATH=`pg_config --bindir` PGSQL_PATH=`pg_config --bindir`
PGSQL_PORT=9823 PGSQL_PORT=9823
${PGSQL_PATH}/initdb -E UTF8 ${PGSQL_DATA} ${PGSQL_PATH}/initdb -E UTF8 ${PGSQL_DATA}
@ -31,4 +31,4 @@ LANGUAGE=C ${PGSQL_PATH}/pg_ctl -w -D ${PGSQL_DATA} -o "-N 100 -F -k ${PGSQL_DAT
export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1" export CEILOMETER_TEST_PGSQL_URL="postgresql:///?host=${PGSQL_DATA}&port=${PGSQL_PORT}&dbname=template1"
# Yield execution to venv command # Yield execution to venv command
$* $*