diff --git a/run-tests.sh b/run-tests.sh index 23f64e6a..e1bec029 100755 --- a/run-tests.sh +++ b/run-tests.sh @@ -23,18 +23,19 @@ fi # Main unit tests MONGO_DATA=`mktemp -d /tmp/CEILO-MONGODB-XXXXX` +MONGO_PORT=29000 trap "clean_exit" EXIT mkfifo ${MONGO_DATA}/out export PATH=${PATH:+$PATH:}/sbin:/usr/sbin -mongod --maxConns 32 --nojournal --noprealloc --smallfiles --quiet --noauth --port 29000 --dbpath "${MONGO_DATA}" --bind_ip localhost &>${MONGO_DATA}/out & +mongod --maxConns 32 --nojournal --noprealloc --smallfiles --quiet --noauth --port ${MONGO_PORT} --dbpath "${MONGO_DATA}" --bind_ip localhost &>${MONGO_DATA}/out & MONGO_PID=$! # Wait for Mongo to start listening to connections while read line do - echo "$line" | grep -q 'waiting for connections on port' && break + echo "$line" | grep -q "waiting for connections on port ${MONGO_PORT}" && break done < ${MONGO_DATA}/out # Read the fifo for ever otherwise mongod would block # + that gives us the log on screen cat ${MONGO_DATA}/out > /dev/null & -export CEILOMETER_TEST_MONGODB_URL="mongodb://localhost:29000/ceilometer" +export CEILOMETER_TEST_MONGODB_URL="mongodb://localhost:${MONGO_PORT}/ceilometer" python setup.py testr --slowest --testr-args="$*" $COVERAGE_ARG