diff options
Diffstat (limited to 'apps/files_external/tests/env')
19 files changed, 45 insertions, 116 deletions
diff --git a/apps/files_external/tests/env/start-amazons3-ceph.sh b/apps/files_external/tests/env/start-amazons3-ceph.sh index 1aa14ac990d..ecaa6e0ff46 100755 --- a/apps/files_external/tests/env/start-amazons3-ceph.sh +++ b/apps/files_external/tests/env/start-amazons3-ceph.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -8,9 +9,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @author Robin McCorkell -# @copyright 2015 ownCloud if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" diff --git a/apps/files_external/tests/env/start-ftp-morrisjobke.sh b/apps/files_external/tests/env/start-ftp-morrisjobke.sh index 3a5f6ffcb67..3074bedce74 100755 --- a/apps/files_external/tests/env/start-ftp-morrisjobke.sh +++ b/apps/files_external/tests/env/start-ftp-morrisjobke.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -8,9 +9,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" diff --git a/apps/files_external/tests/env/start-sftp-atmoz.sh b/apps/files_external/tests/env/start-sftp-atmoz.sh index 0fc0c5c427f..9d444515a8a 100755 --- a/apps/files_external/tests/env/start-sftp-atmoz.sh +++ b/apps/files_external/tests/env/start-sftp-atmoz.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -8,9 +9,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" diff --git a/apps/files_external/tests/env/start-smb-linux.sh b/apps/files_external/tests/env/start-smb-linux.sh index 173dd25ebb9..ca303b521f4 100755 --- a/apps/files_external/tests/env/start-smb-linux.sh +++ b/apps/files_external/tests/env/start-smb-linux.sh @@ -1,6 +1,7 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -8,9 +9,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# # retrieve current folder to place the config in the parent folder thisFolder=`echo $0 | sed 's#env/start-smb-linux\.sh##'` diff --git a/apps/files_external/tests/env/start-smb-windows.sh b/apps/files_external/tests/env/start-smb-windows.sh index a23c879dd96..3c5570a2f80 100755 --- a/apps/files_external/tests/env/start-smb-windows.sh +++ b/apps/files_external/tests/env/start-smb-windows.sh @@ -1,12 +1,10 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # Set environment variable DEBUG to print config file # -# @author Thomas Müller -# @copyright 2015 Thomas Müller <deepdiver@owncloud.com> -# # retrieve current folder to place the config in the parent folder thisFolder=`echo $0 | sed 's#env/start-smb-windows\.sh##'` diff --git a/apps/files_external/tests/env/start-swift-ceph.sh b/apps/files_external/tests/env/start-swift-ceph.sh index 3a299a6fa85..c646b9eef28 100755 --- a/apps/files_external/tests/env/start-swift-ceph.sh +++ b/apps/files_external/tests/env/start-swift-ceph.sh @@ -1,6 +1,7 @@ #!/bin/bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -8,9 +9,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @author Robin McCorkell -# @copyright 2015 ownCloud if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" diff --git a/apps/files_external/tests/env/start-webdav-apache.sh b/apps/files_external/tests/env/start-webdav-apache.sh index a5464c9cfab..517f278a366 100755 --- a/apps/files_external/tests/env/start-webdav-apache.sh +++ b/apps/files_external/tests/env/start-webdav-apache.sh @@ -1,6 +1,8 @@ #!/bin/bash # -# ownCloud +# SPDX-FileCopyrightText: 2017-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2015 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -11,10 +13,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @copyright 2014 Morris Jobke <hey@morrisjobke.de> -# @copyright 2016 Vincent Petry <pvince81@owncloud.com> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" @@ -23,8 +21,8 @@ fi echo "Docker executable found - setup docker" -echo "Fetch recent morrisjobke/webdav docker image" -docker pull morrisjobke/webdav +echo "Fetch recent webdav docker image" +docker pull ghcr.io/nextcloud/continuous-integration-webdav-apache:latest # retrieve current folder to place the config in the parent folder thisFolder=`echo $0 | sed 's#env/start-webdav-apache\.sh##'` @@ -45,7 +43,7 @@ if [ -n "$RUN_DOCKER_MYSQL" ]; then parameter="--link $containerName:db" fi -container=`docker run -P $parameter -d -e USERNAME=test -e PASSWORD=test morrisjobke/webdav` +container=`docker run -P $parameter -d --rm ghcr.io/nextcloud/continuous-integration-webdav-apache:latest` host=`docker inspect --format="{{.NetworkSettings.IPAddress}}" $container` echo -n "Waiting for Apache initialization on ${host}:${port}" @@ -64,7 +62,7 @@ return array( 'run'=>true, 'host'=>'${host}:80/webdav/', 'user'=>'test', - 'password'=>'test', + 'password'=>'pass', 'root'=>'', // wait delay in seconds after write operations // (only in tests) diff --git a/apps/files_external/tests/env/start-webdav-apachedrone.sh b/apps/files_external/tests/env/start-webdav-apachedrone.sh deleted file mode 100755 index 9887cea5eee..00000000000 --- a/apps/files_external/tests/env/start-webdav-apachedrone.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env bash -# -# Nextcloud -# - -# retrieve current folder to place the config in the parent folder -thisFolder=`echo $0 | sed 's#env/start-webdav-apachedrone\.sh##'` - -if [ -z "$thisFolder" ]; then - thisFolder="." -fi; - -cat > $thisFolder/config.webdav.php <<DELIM -<?php - -return array( - 'run'=>true, - 'host'=>'127.0.0.1:80/webdav/', - 'user'=>'test', - 'password'=>'pass', - 'root'=>'', - 'wait'=> 0 -); - -DELIM - diff --git a/apps/files_external/tests/env/start-webdav-ownCloud.sh b/apps/files_external/tests/env/start-webdav-ownCloud.sh index 870bd5bcdf8..9d833330205 100755 --- a/apps/files_external/tests/env/start-webdav-ownCloud.sh +++ b/apps/files_external/tests/env/start-webdav-ownCloud.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash # -# ownCloud +#!/bin/bash +# +# SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2014-2015 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script start a docker container to test the files_external tests # against. It will also change the files_external config to use the docker @@ -11,9 +15,6 @@ # # Set environment variable DEBUG to print config file # -# @author Morris Jobke -# @copyright 2014 Morris Jobke <hey@morrisjobke.de> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker setup" diff --git a/apps/files_external/tests/env/stop-amazons3-ceph.sh b/apps/files_external/tests/env/stop-amazons3-ceph.sh index f559f8f9058..5e7aac5d5e7 100755 --- a/apps/files_external/tests/env/stop-amazons3-ceph.sh +++ b/apps/files_external/tests/env/stop-amazons3-ceph.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script stops the docker container the files_external tests were run # against. It will also revert the config changes done in start step. # -# @author Morris Jobke -# @author Robin McCorkell -# @copyright 2015 ownCloud if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker stop" diff --git a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh index eedf8f82a50..cb6c8ee9d94 100755 --- a/apps/files_external/tests/env/stop-ftp-morrisjobke.sh +++ b/apps/files_external/tests/env/stop-ftp-morrisjobke.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script stops the docker container the files_external tests were run # against. It will also revert the config changes done in start step. # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker stop" diff --git a/apps/files_external/tests/env/stop-sftp-atmoz.sh b/apps/files_external/tests/env/stop-sftp-atmoz.sh index 44380152340..0dcdcebf96d 100755 --- a/apps/files_external/tests/env/stop-sftp-atmoz.sh +++ b/apps/files_external/tests/env/stop-sftp-atmoz.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script stops the docker container the files_external tests were run # against. It will also revert the config changes done in start step. # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker stop" diff --git a/apps/files_external/tests/env/stop-smb-linux.sh b/apps/files_external/tests/env/stop-smb-linux.sh index 434d3e166b1..dd9e78d2811 100755 --- a/apps/files_external/tests/env/stop-smb-linux.sh +++ b/apps/files_external/tests/env/stop-smb-linux.sh @@ -1,13 +1,11 @@ #!/usr/bin/env bash # -# ownCloud +# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors +# SPDX-License-Identifier: AGPL-3.0-or-later # # This script stops the docker container the files_external tests were run # against. It will also revert the config changes done in start step. # -# @author Morris Jobke -# @copyright 2015 Morris Jobke <hey@morrisjobke.de> -# # retrieve current folder to remove the config from the parent folder thisFolder=`echo $0 | sed 's#env/stop-smb-linux\.sh##'` diff --git a/apps/files_external/tests/env/stop-smb-windows.sh b/apps/files_external/tests/env/stop-smb-windows.sh index 39c49e2c505..268b531e145 100755 --- a/apps/files_external/tests/env/stop-smb-windows.sh +++ b/apps/files_external/tests/env/stop-smb-windows.sh @@ -1,9 +1,7 @@ #!/usr/bin/env bash # -# ownCloud -# -# @author Thomas Müller -# @copyright 2015 Thomas Müller <deepdiver@owncloud.com> +# SPDX-FileCopyrightText: 2015 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # retrieve current folder to remove the config from the parent folder diff --git a/apps/files_external/tests/env/stop-swift-ceph.sh b/apps/files_external/tests/env/stop-swift-ceph.sh index 418f96e63f6..d23ca2f13dc 100755 --- a/apps/files_external/tests/env/stop-swift-ceph.sh +++ b/apps/files_external/tests/env/stop-swift-ceph.sh @@ -1,13 +1,11 @@ #!/bin/bash # -# ownCloud +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # # This script stops the docker container the files_external tests were run # against. It will also revert the config changes done in start step. # -# @author Morris Jobke -# @author Robin McCorkell -# @copyright 2015 ownCloud if ! command -v docker >/dev/null 2>&1; then echo "No docker executable found - skipped docker stop" diff --git a/apps/files_external/tests/env/stop-webdav-apache.sh b/apps/files_external/tests/env/stop-webdav-apache.sh index e898a65cc36..825f39470b1 100755 --- a/apps/files_external/tests/env/stop-webdav-apache.sh +++ b/apps/files_external/tests/env/stop-webdav-apache.sh @@ -1,13 +1,7 @@ #!/bin/bash # -# ownCloud -# -# This script stops the docker container the files_external tests were run -# against. It will also revert the config changes done in start step. -# -# @author Morris Jobke -# @copyright 2014 Morris Jobke <hey@morrisjobke.de> -# @copyright 2016 Vincent Petry <pvince81@owncloud.com> +# SPDX-FileCopyrightText: 2015-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # if ! command -v docker >/dev/null 2>&1; then diff --git a/apps/files_external/tests/env/stop-webdav-apachedrone.sh b/apps/files_external/tests/env/stop-webdav-apachedrone.sh deleted file mode 100755 index 3c4b0492dd0..00000000000 --- a/apps/files_external/tests/env/stop-webdav-apachedrone.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env bash -# -# Nextcloud - -# retrieve current folder to remove the config from the parent folder -thisFolder=`echo $0 | sed 's#env/stop-webdav-apachedrone\.sh##'` - -if [ -z "$thisFolder" ]; then - thisFolder="." -fi; - -# cleanup -rm $thisFolder/config.webdav.php - diff --git a/apps/files_external/tests/env/stop-webdav-ownCloud.sh b/apps/files_external/tests/env/stop-webdav-ownCloud.sh index 613a22efb8c..140e7cce23b 100755 --- a/apps/files_external/tests/env/stop-webdav-ownCloud.sh +++ b/apps/files_external/tests/env/stop-webdav-ownCloud.sh @@ -1,12 +1,7 @@ #!/usr/bin/env bash # -# ownCloud -# -# This script stops the docker container the files_external tests were run -# against. It will also revert the config changes done in start step. -# -# @author Morris Jobke -# @copyright 2014 Morris Jobke <hey@morrisjobke.de> +# SPDX-FileCopyrightText: 2014-2016 ownCloud, Inc. +# SPDX-License-Identifier: AGPL-3.0-only # if ! command -v docker >/dev/null 2>&1; then diff --git a/apps/files_external/tests/env/wait-for-connection b/apps/files_external/tests/env/wait-for-connection index 2c480fb733e..a3ff5591122 100755 --- a/apps/files_external/tests/env/wait-for-connection +++ b/apps/files_external/tests/env/wait-for-connection @@ -1,6 +1,11 @@ #!/usr/bin/php <?php +/** + * SPDX-FileCopyrightText: 2015 ownCloud, Inc. + * SPDX-License-Identifier: AGPL-3.0-only + */ + $timeout = 60; switch ($argc) { |