diff options
| author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-10-29 12:23:01 +0100 |
|---|---|---|
| committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-10-29 16:23:38 +0100 |
| commit | b321e47e5de6b6564195f5d3b26dfa4c465235f3 (patch) | |
| tree | bb6ecc8c4f7ba9ab8c46f90fe72251308c6f87fa /tests | |
| parent | 2bd81a2557f5b279f0f579fa334e2d5d670012dc (diff) | |
| download | nextcloud-server-b321e47e5de6b6564195f5d3b26dfa4c465235f3.tar.gz nextcloud-server-b321e47e5de6b6564195f5d3b26dfa4c465235f3.zip | |
Link the default Apache directory to the Nextcloud server in all runners
In order to run the acceptance tests in Apache "/var/www/html" has to be
linked to the root directory of the Nextcloud server. Before this was
automatically done when launching the acceptance tests through
"./run.sh", but an explicit command was needed when run in Drone. Now
the linking was moved from "run.sh" to "run-local.sh", so it is
automatically done when run through "./run.sh" and in Drone, including
when running the tests for an app instead of for the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/acceptance/run-local.sh | 4 | ||||
| -rwxr-xr-x | tests/acceptance/run.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/acceptance/run-local.sh b/tests/acceptance/run-local.sh index 7ae6705000c..548e9e9ceae 100755 --- a/tests/acceptance/run-local.sh +++ b/tests/acceptance/run-local.sh @@ -189,6 +189,10 @@ composer install cd ../../ +# Link the default Apache directory to the root directory of the Nextcloud +# server to make possible to run the Nextcloud server on Apache if needed. +ln --symbolic $(pwd) /var/www/html + INSTALL_AND_CONFIGURE_SERVER_PARAMETERS="" if [ "$NEXTCLOUD_SERVER_DOMAIN" != "$DEFAULT_NEXTCLOUD_SERVER_DOMAIN" ]; then INSTALL_AND_CONFIGURE_SERVER_PARAMETERS+="--nextcloud-server-domain $NEXTCLOUD_SERVER_DOMAIN" diff --git a/tests/acceptance/run.sh b/tests/acceptance/run.sh index 3ed1207e379..366e7a67bf5 100755 --- a/tests/acceptance/run.sh +++ b/tests/acceptance/run.sh @@ -153,10 +153,6 @@ function prepareDocker() { docker exec $NEXTCLOUD_LOCAL_CONTAINER mkdir /nextcloud docker cp - $NEXTCLOUD_LOCAL_CONTAINER:/nextcloud/ < "$NEXTCLOUD_LOCAL_TAR" - # Link the default Apache directory to the root directory of the Nextcloud - # server to make possible to run the Nextcloud server on Apache if needed. - docker exec $NEXTCLOUD_LOCAL_CONTAINER ln --symbolic /nextcloud /var/www/html - # run-local.sh expects a Git repository to be available in the root of the # Nextcloud server, but it was excluded when the Git working directory was # copied to the container to avoid copying the large and unneeded history of |