openstack/aodh
Code Issues Proposed changes

run-tests: fix MongoDB start wait

Browse Source 
There's actually 2 lines that matches the current rule:

  [websvr] admin web console waiting for connections on port 30000
  [initandlisten] waiting for connections on port 29000

Let's make it more tighten.

Related-Bug: #1218488

Change-Id: I4ba56a7c2406a9851aa8087b4cabb0aa31698763
This commit is contained in:
Julien Danjou 2013-09-09 11:04:34 +02:00
parent f505ae11b7
commit 84c571acb9
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
run-tests.sh
View File

@ -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