diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-05-15 16:51:12 +0200 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-05-29 18:20:58 +0200 |
| commit | f4a64051b64d9f9fd4a3202e9386a8ac35de927e (patch) | |
| tree | 966890f1c075b856121bd280b3bddd96f35e8572 /tests/acceptance | |
| parent | c0ed6f91a8217c9a1cbb720167bfd0d85bd467bc (diff) | |
| download | nextcloud-server-f4a64051b64d9f9fd4a3202e9386a8ac35de927e.tar.gz nextcloud-server-f4a64051b64d9f9fd4a3202e9386a8ac35de927e.zip | |
Extract path to configuration dir to its own variable
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'tests/acceptance')
| -rwxr-xr-x | tests/acceptance/run-local.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index fcf6155d6f7..38e23588b18 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -63,6 +63,8 @@ if [ "$1" = "--acceptance-tests-dir" ]; then shift 2 fi +ACCEPTANCE_TESTS_CONFIG_DIR="../../$ACCEPTANCE_TESTS_DIR/config" + # "--timeout-multiplier N" option can be provided to set the timeout multiplier # to be used in ActorContext. TIMEOUT_MULTIPLIER="" @@ -133,7 +135,7 @@ if [ "$TIMEOUT_MULTIPLIER" != "" ]; then REPLACEMENT="\ - ActorContext:\n\ actorTimeoutMultiplier: $TIMEOUT_MULTIPLIER" - sed --in-place "s/$ORIGINAL/$REPLACEMENT/" ../../$ACCEPTANCE_TESTS_DIR/config/behat.yml + sed --in-place "s/$ORIGINAL/$REPLACEMENT/" $ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml fi if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then @@ -154,7 +156,7 @@ if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then - NextcloudTestServerContext:\n\ nextcloudTestServerHelperParameters:\n\ - $NEXTCLOUD_SERVER_DOMAIN" - sed --in-place "s/$ORIGINAL/$REPLACEMENT/" ../../$ACCEPTANCE_TESTS_DIR/config/behat.yml + sed --in-place "s/$ORIGINAL/$REPLACEMENT/" $ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml fi if [ "$SELENIUM_SERVER" != "$DEFAULT_SELENIUM_SERVER" ]; then @@ -215,4 +217,4 @@ cd tests/acceptance echo "Waiting for Selenium" timeout 60s bash -c "while ! curl $SELENIUM_SERVER >/dev/null 2>&1; do sleep 1; done" -vendor/bin/behat --config=../../$ACCEPTANCE_TESTS_DIR/config/behat.yml $SCENARIO_TO_RUN +vendor/bin/behat --config=$ACCEPTANCE_TESTS_CONFIG_DIR/behat.yml $SCENARIO_TO_RUN |