Skip to content
Snippets Groups Projects
Commit 36660734 authored by Thomas Müller's avatar Thomas Müller
Browse files

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

tail the server log and exit with the exit code of behat
parents f48ea593 21e063a9
No related branches found
No related tags found
No related merge requests found
...@@ -2,12 +2,11 @@ ...@@ -2,12 +2,11 @@
composer install composer install
# TODO: avoid port collision on jenkins - use $EXECUTOR_NUMBER # avoid port collision on jenkins - use $EXECUTOR_NUMBER
if [ -z "$EXECUTOR_NUMBER" ]; then if [ -z "$EXECUTOR_NUMBER" ]; then
EXECUTOR_NUMBER=0 EXECUTOR_NUMBER=0
fi fi
PORT=$((8080 + $EXECUTOR_NUMBER)) PORT=$((8080 + $EXECUTOR_NUMBER))
#PORT=8080
echo $PORT echo $PORT
php -S localhost:$PORT -t ../.. & php -S localhost:$PORT -t ../.. &
PHPPID=$! PHPPID=$!
...@@ -23,6 +22,12 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/" ...@@ -23,6 +22,12 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/"
export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/" export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/"
vendor/bin/behat -f junit -f pretty vendor/bin/behat -f junit -f pretty
RESULT=$?
kill $PHPPID kill $PHPPID
kill $PHPPID_FED kill $PHPPID_FED
tail "../../data/owncloud.log"
exit $RESULT
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment