Merge "Be explicit about using /tmp for temporary datafiles"
This commit is contained in:
commit
42b5feb08f
@ -12,7 +12,7 @@ export PATH=${PATH:+$PATH:}/sbin:/usr/sbin
|
||||
check_for_cmd mongod
|
||||
|
||||
# Start MongoDB process for tests
|
||||
MONGO_DATA=`mktemp -d CEILO-MONGODB-XXXXX`
|
||||
MONGO_DATA=`mktemp -d /tmp/CEILO-MONGODB-XXXXX`
|
||||
MONGO_PORT=29000
|
||||
trap "clean_exit ${MONGO_DATA}" EXIT
|
||||
mkfifo ${MONGO_DATA}/out
|
||||
|
@ -21,7 +21,7 @@ function clean_exit_pgsql(){
|
||||
check_for_cmd pg_config
|
||||
|
||||
# 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_PORT=9823
|
||||
${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"
|
||||
|
||||
# Yield execution to venv command
|
||||
$*
|
||||
$*
|
||||
|
Loading…
x
Reference in New Issue
Block a user