Merge pull request #20855 from owncloud/output-log-integration-tests

tail the server log and exit with the exit code of behat
This commit is contained in:
Thomas Müller 2015-12-01 10:21:25 +01:00
commit 36660734a6
1 changed files with 7 additions and 2 deletions

View File

@ -2,12 +2,11 @@
composer install
# TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER
# avoid port collision on jenkins - use $EXECUTOR_NUMBER
if [ -z "$EXECUTOR_NUMBER" ]; then
EXECUTOR_NUMBER=0
fi
PORT=$((8080 + $EXECUTOR_NUMBER))
#PORT=8080
echo $PORT
php -S localhost:$PORT -t ../.. &
PHPPID=$!
@ -23,6 +22,12 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
vendor/bin/behat -f junit -f pretty
RESULT=$?
kill $PHPPID
kill $PHPPID_FED
tail "../../data/owncloud.log"
exit $RESULT