diff options
Diffstat (limited to 'build/integration/run.sh')
| -rwxr-xr-x | build/integration/run.sh | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/build/integration/run.sh b/build/integration/run.sh index 145415fd079..83600d8323e 100755 --- a/build/integration/run.sh +++ b/build/integration/run.sh @@ -1,22 +1,15 @@ #!/usr/bin/env bash -COMPOSER=$(which composer) - +OC_PATH=../../ +OCC=${OC_PATH}occ SCENARIO_TO_RUN=$1 HIDE_OC_LOGS=$2 -if [ -x "$COMPOSER" ]; then - echo "Using composer executable $COMPOSER" -else - echo "Could not find composer executable" >&2 - exit 1 -fi - -INSTALLED=$(../../occ status | grep installed: | cut -d " " -f 5) +INSTALLED=$($OCC status | grep installed: | cut -d " " -f 5) if [ "$INSTALLED" == "true" ]; then # Disable bruteforce protection because the integration tests do trigger them - ../../occ config:system:set auth.bruteforce.protection.enabled --value false --type bool + $OCC config:system:set auth.bruteforce.protection.enabled --value false --type bool else if [ "$SCENARIO_TO_RUN" != "setup_features/setup.feature" ]; then echo "Nextcloud instance needs to be installed" >&2 @@ -46,33 +39,36 @@ export TEST_SERVER_URL="http://localhost:$PORT/ocs/" export TEST_SERVER_FED_URL="http://localhost:$PORT_FED/ocs/" if [ "$INSTALLED" == "true" ]; then + #Enable external storage app - ../../occ app:enable files_external + $OCC app:enable files_external mkdir -p work/local_storage - OUTPUT_CREATE_STORAGE=`../../occ files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` + OUTPUT_CREATE_STORAGE=`$OCC files_external:create local_storage local null::null -c datadir=./build/integration/work/local_storage` ID_STORAGE=`echo $OUTPUT_CREATE_STORAGE | awk {'print $5'}` - ../../occ files_external:option $ID_STORAGE enable_sharing true + $OCC files_external:option $ID_STORAGE enable_sharing true + fi -vendor/bin/behat -f junit -f pretty $SCENARIO_TO_RUN +vendor/bin/behat --strict -f junit -f pretty $SCENARIO_TO_RUN RESULT=$? kill $PHPPID kill $PHPPID_FED if [ "$INSTALLED" -eq "true" ]; then - ../../occ files_external:delete -y $ID_STORAGE + + $OCC files_external:delete -y $ID_STORAGE #Disable external storage app - ../../occ app:disable files_external + $OCC app:disable files_external fi if [ -z $HIDE_OC_LOGS ]; then - tail "../../data/nextcloud.log" + tail "${OC_PATH}/data/nextcloud.log" fi +echo "runsh: Exit code: $RESULT" exit $RESULT - |