From 7ae7f7fd12154eb73e02ad0cd0877ac23eb41e8c Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Thu, 19 Sep 2024 18:37:09 +0200 Subject: [PATCH 1/2] chore: Remove old travis related stuff Signed-off-by: Ferdinand Thiessen --- apps/settings/.editorconfig | 2 +- apps/updatenotification/Makefile | 1 - core/vendor/.gitignore | 1 - lib/private/legacy/OC_Util.php | 3 +- tests/lib/TestCase.php | 5 - tests/travis/before_install.sh | 41 ------- tests/travis/changed_app.sh | 19 ---- tests/travis/custom.ini | 6 - tests/travis/install.sh | 182 ------------------------------- 9 files changed, 2 insertions(+), 258 deletions(-) delete mode 100644 tests/travis/before_install.sh delete mode 100755 tests/travis/changed_app.sh delete mode 100644 tests/travis/custom.ini delete mode 100755 tests/travis/install.sh diff --git a/apps/settings/.editorconfig b/apps/settings/.editorconfig index e9391ffef4d3c..fab810415cf14 100644 --- a/apps/settings/.editorconfig +++ b/apps/settings/.editorconfig @@ -9,6 +9,6 @@ end_of_line = lf insert_final_newline = true trim_trailing_whitespace = true -[{package.json,.travis.yml,webpack.config.js}] +[{package.json,webpack.config.js}] indent_style = space indent_size = 2 \ No newline at end of file diff --git a/apps/updatenotification/Makefile b/apps/updatenotification/Makefile index 6db98f27cac55..b64cd1a6290ca 100644 --- a/apps/updatenotification/Makefile +++ b/apps/updatenotification/Makefile @@ -49,7 +49,6 @@ package: clean build-js-production --exclude=/SECURITY.md \ --exclude=/.gitignore \ --exclude=/.scrutinizer.yml \ - --exclude=/.travis.yml \ --exclude=/.drone.yml \ --exclude=/node_modules \ --exclude=/npm-debug.log \ diff --git a/core/vendor/.gitignore b/core/vendor/.gitignore index 1d5553f369ab1..478ced55415bf 100644 --- a/core/vendor/.gitignore +++ b/core/vendor/.gitignore @@ -6,7 +6,6 @@ src/ bower.json component.json .jshintrc -.travis.yml CHANGELOG* Gemfile gruntfile.js diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 0c8fcc56f3254..a6478ae11f849 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -545,8 +545,7 @@ public static function checkServer(\OC\SystemConfig $config) { // defined = defined // ini = ini_get // If the dependency is not found the missing module name is shown to the EndUser - // When adding new checks always verify that they pass on Travis as well - // for ini settings, see https://github.com/owncloud/administration/blob/master/travis-ci/custom.ini + // When adding new checks always verify that they pass on CI as well $dependencies = [ 'classes' => [ 'ZipArchive' => 'zip', diff --git a/tests/lib/TestCase.php b/tests/lib/TestCase.php index d74dacd76c112..cfed2b06c61b1 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -533,11 +533,6 @@ protected function getGroupAnnotations(): array { } protected function IsDatabaseAccessAllowed() { - // on travis-ci.org we allow database access in any case - otherwise - // this will break all apps right away - if (getenv('TRAVIS') == true) { - return true; - } $annotations = $this->getGroupAnnotations(); if (isset($annotations)) { if (in_array('DB', $annotations) || in_array('SLOWDB', $annotations)) { diff --git a/tests/travis/before_install.sh b/tests/travis/before_install.sh deleted file mode 100644 index b05e93e856f63..0000000000000 --- a/tests/travis/before_install.sh +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2015 ownCloud, Inc. -# SPDX-License-Identifier: AGPL-3.0-only -# -# @author Thomas Müller -# @copyright 2014 Thomas Müller thomas.mueller@tmit.eu -# - -set -e - -WORKDIR=$PWD -DB=$1 -echo "Work directory: $WORKDIR" -echo "Database: $DB" - -if [ "$DB" == "mysql" ] ; then - echo "Setting up mysql ..." - mysql -e 'create database oc_autotest;' - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY 'owncloud'"; - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost'"; - mysql -e "SELECT User FROM mysql.user;" -fi - -if [ "$DB" == "pgsql" ] ; then - createuser -U travis -s oc_autotest -fi - -#if [ "$DB" == "oracle" ] ; then -# if [ ! -f before_install_oracle.sh ]; then -# wget https://raw.githubusercontent.com/owncloud/administration/master/travis-ci/before_install_oracle.sh -# fi -# bash ./before_install_oracle.sh -#fi - -# -# copy custom php.ini settings -# -if [ $(phpenv version-name) != 'hhvm' ]; then - phpenv config-add tests/travis/custom.ini -fi diff --git a/tests/travis/changed_app.sh b/tests/travis/changed_app.sh deleted file mode 100755 index 59410788bd9c7..0000000000000 --- a/tests/travis/changed_app.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2015 ownCloud, Inc. -# SPDX-License-Identifier: AGPL-3.0-only -# -# @author Joas Schilling -# @author Thomas Müller -# @copyright 2015 Thomas Müller thomas.mueller@tmit.eu -# - -APP=$1 - -FOUND=$(git diff ${TRAVIS_COMMIT_RANGE} | grep -- "^+++ b/apps/$APP/") - -if [ "x$FOUND" != 'x' ]; then - echo "1" -else - echo "0" -fi diff --git a/tests/travis/custom.ini b/tests/travis/custom.ini deleted file mode 100644 index 6eea6fb5cec43..0000000000000 --- a/tests/travis/custom.ini +++ /dev/null @@ -1,6 +0,0 @@ -# SPDX-FileCopyrightText: 2015 ownCloud, Inc. -# SPDX-License-Identifier: AGPL-3.0-only -always_populate_raw_post_data = -1 -mbstring.func_overload = 0 -default_charset = 'UTF-8' -output_buffering = off diff --git a/tests/travis/install.sh b/tests/travis/install.sh deleted file mode 100755 index bfedb45caa355..0000000000000 --- a/tests/travis/install.sh +++ /dev/null @@ -1,182 +0,0 @@ -#!/bin/bash -# -# SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors -# SPDX-FileCopyrightText: 2016 ownCloud, Inc. -# SPDX-License-Identifier: AGPL-3.0-only -# -# @author Thomas Müller -# @copyright 2014 Thomas Müller thomas.mueller@tmit.eu -# - -set -e - -DATABASENAME=oc_autotest -DATABASEUSER=oc_autotest -ADMINLOGIN=admin -BASEDIR=$PWD - -DBCONFIGS="sqlite mysql pgsql oracle" -PHPUNIT=$(which phpunit) - -# set oracle home if it is not set -TRAVIS_ORACLE_HOME="/usr/lib/oracle/xe/app/oracle/product/10.2.0/server" -[ -z "$ORACLE_HOME" ] && ORACLE_HOME=$TRAVIS_ORACLE_HOME - -if [ $1 ]; then - FOUND=0 - for DBCONFIG in $DBCONFIGS; do - if [ $1 = $DBCONFIG ]; then - FOUND=1 - break - fi - done - if [ $FOUND = 0 ]; then - echo -e "Unknown database config name \"$1\"\n" >&2 - print_syntax - exit 2 - fi -fi - -# use tmpfs for datadir - should speedup unit test execution -DATADIR=$BASEDIR/data-autotest - -echo "Using database $DATABASENAME" - -# create autoconfig for sqlite, mysql and postgresql -cat > ./tests/autoconfig-sqlite.php < false, - 'dbtype' => 'sqlite', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', -); -DELIM - -cat > ./tests/autoconfig-mysql.php < false, - 'dbtype' => 'mysql', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', - 'dbuser' => '$DATABASEUSER', - 'dbname' => '$DATABASENAME', - 'dbhost' => 'localhost', - 'dbpass' => 'owncloud', -); -DELIM - -cat > ./tests/autoconfig-pgsql.php < false, - 'dbtype' => 'pgsql', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', - 'dbuser' => '$DATABASEUSER', - 'dbname' => '$DATABASENAME', - 'dbhost' => 'localhost', - 'dbpass' => '', -); -DELIM - -cat > ./tests/autoconfig-oracle.php < false, - 'dbtype' => 'oci', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', - 'dbuser' => '$DATABASENAME', - 'dbname' => 'XE', - 'dbhost' => 'localhost', - 'dbpass' => 'owncloud', - 'loglevel' => 0, -); -DELIM - -function execute_tests { - echo "Setup environment for $1 testing ..." - # back to root folder - cd $BASEDIR - - # revert changes to tests/data - git checkout tests/data/* - - # reset data directory - rm -rf $DATADIR - mkdir $DATADIR - - cp tests/preseed-config.php config/config.php - - if [ "$1" == "oracle" ] ; then - echo "Load Oracle environment variables so that we can run 'sqlplus'." - . $ORACLE_HOME/bin/oracle_env.sh - - echo "create the database" - sqlplus -s -l / as sysdba < Date: Thu, 19 Sep 2024 18:54:43 +0200 Subject: [PATCH 2/2] chore: Get rid of travis in DAV app Signed-off-by: Ferdinand Thiessen --- .github/workflows/integration-dav.yml | 4 +- .reuse/dep5 | 4 +- apps/dav/tests/misc/sharing.xml | 11 ----- .../{travis => testsuits}/caldav/install.sh | 0 .../caldav/script-new-endpoint.sh | 0 .../caldav/script-old-endpoint.sh | 0 .../CalDAV/current-user-principal/1.xml | 0 .../data/Resource/CalDAV/reports/put/1.txt | 0 .../data/Resource/CalDAV/reports/put/1.xml | 0 .../data/Resource/CalDAV/reports/put/2.txt | 0 .../data/Resource/CalDAV/reports/put/3.txt | 0 .../data/Resource/CalDAV/reports/put/4.txt | 0 .../data/Resource/CalDAV/reports/put/5.txt | 0 .../data/Resource/CalDAV/reports/put/6.txt | 0 .../data/Resource/CalDAV/reports/sync/1.xml | 0 .../data/Resource/CalDAV/reports/sync/10.xml | 0 .../data/Resource/CalDAV/reports/sync/11.xml | 0 .../data/Resource/CalDAV/reports/sync/2.xml | 0 .../data/Resource/CalDAV/reports/sync/21.xml | 0 .../data/Resource/CalDAV/reports/sync/3.xml | 0 .../data/Resource/CalDAV/reports/sync/4.xml | 0 .../data/Resource/CalDAV/reports/sync/5.xml | 0 .../data/Resource/CalDAV/reports/sync/6.xml | 0 .../data/Resource/CalDAV/reports/sync/7.xml | 0 .../data/Resource/CalDAV/reports/sync/8.xml | 0 .../CalDAV/sharing/calendars/read-write/1.xml | 0 .../CalDAV/sharing/calendars/read-write/4.xml | 0 .../CalDAV/sharing/calendars/read-write/5.ics | 0 .../CalDAV/sharing/calendars/read-write/5.xml | 0 .../CalDAV/sharing/calendars/read-write/6.ics | 0 .../CalDAV/sharing/calendars/read-write/7.ics | 0 .../CalDAV/sharing/calendars/read-write/8.ics | 0 .../CalDAV/sharing/calendars/read-write/9.ics | 0 .../Resource/CardDAV/sharing/read-write/1.xml | 0 .../Resource/CardDAV/sharing/read-write/4.xml | 0 .../Resource/CardDAV/sharing/read-write/6.vcf | 0 .../Resource/CardDAV/sharing/read-write/7.vcf | 0 .../Resource/CardDAV/sharing/read-write/8.vcf | 0 .../Resource/CardDAV/sharing/read-write/9.vcf | 0 .../CardDAV/vcurrent-user-principal/1.xml | 0 .../data/Resource/CardDAV/vreports/put/1.vcf | 0 .../data/Resource/CardDAV/vreports/put/2.vcf | 0 .../data/Resource/CardDAV/vreports/put/3.vcf | 0 .../data/Resource/CardDAV/vreports/sync/1.xml | 0 .../data/Resource/CardDAV/vreports/sync/2.xml | 0 .../caldavtest/serverinfo-new-endpoint.xml | 3 +- .../serverinfo-old-caldav-endpoint.xml | 3 +- .../serverinfo-old-carddav-endpoint.xml | 3 +- .../caldavtest/serverinfo.dtd | 0 .../tests/CalDAV/current-user-principal.xml | 0 .../tests/CalDAV/sharing-calendars.xml | 0 .../caldavtest/tests/CalDAV/sync-report.xml | 0 .../tests/CardDAV/current-user-principal.xml | 0 .../tests/CardDAV/sharing-addressbooks.xml | 0 .../caldavtest/tests/CardDAV/sync-report.xml | 0 .../{travis => testsuits}/carddav/install.sh | 0 .../carddav/script-new-endpoint.sh | 0 .../carddav/script-old-endpoint.sh | 0 .../{travis => testsuits}/carddav/script.sh | 0 .../{travis => testsuits}/litmus-v1/script.sh | 0 .../{travis => testsuits}/litmus-v2/script.sh | 0 .../tests/unit/CalDAV/CalDavBackendTest.php | 46 +++++++++---------- apps/dav/tests/unit/phpunit.xml | 1 - .../caldav-search-limit-timerange-1.ics | 0 .../caldav-search-limit-timerange-2.ics | 0 .../caldav-search-limit-timerange-3.ics | 0 .../caldav-search-limit-timerange-4.ics | 0 .../caldav-search-limit-timerange-5.ics | 0 .../caldav-search-limit-timerange-6.ics | 0 .../caldav-search-missing-start-1.ics | 0 .../caldav-search-missing-start-2.ics | 0 71 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 apps/dav/tests/misc/sharing.xml rename apps/dav/tests/{travis => testsuits}/caldav/install.sh (100%) rename apps/dav/tests/{travis => testsuits}/caldav/script-new-endpoint.sh (100%) rename apps/dav/tests/{travis => testsuits}/caldav/script-old-endpoint.sh (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/1.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/2.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/3.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/4.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/5.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/put/6.txt (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/10.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/11.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/2.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/21.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/3.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/4.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/5.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/6.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/7.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/reports/sync/8.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-new-endpoint.xml (99%) rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-old-caldav-endpoint.xml (99%) rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo-old-carddav-endpoint.xml (99%) rename apps/dav/tests/{travis => testsuits}/caldavtest/serverinfo.dtd (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/current-user-principal.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/sharing-calendars.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CalDAV/sync-report.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/current-user-principal.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/sharing-addressbooks.xml (100%) rename apps/dav/tests/{travis => testsuits}/caldavtest/tests/CardDAV/sync-report.xml (100%) rename apps/dav/tests/{travis => testsuits}/carddav/install.sh (100%) rename apps/dav/tests/{travis => testsuits}/carddav/script-new-endpoint.sh (100%) rename apps/dav/tests/{travis => testsuits}/carddav/script-old-endpoint.sh (100%) rename apps/dav/tests/{travis => testsuits}/carddav/script.sh (100%) rename apps/dav/tests/{travis => testsuits}/litmus-v1/script.sh (100%) rename apps/dav/tests/{travis => testsuits}/litmus-v2/script.sh (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-1.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-2.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-3.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-4.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-5.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-limit-timerange-6.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-missing-start-1.ics (100%) rename apps/dav/tests/{misc => unit/test_fixtures}/caldav-search-missing-start-2.ics (100%) diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml index ce493ae42b171..41404a82297c8 100644 --- a/.github/workflows/integration-dav.yml +++ b/.github/workflows/integration-dav.yml @@ -99,9 +99,9 @@ jobs: - name: Run CalDAVTester run: | - cp "apps/dav/tests/travis/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/travis/caldavtest/serverinfo.xml" + cp "apps/dav/tests/testsuits/caldavtest/serverinfo-${{ matrix.endpoint }}${{ matrix.endpoint == 'old' && (matrix.service == 'CardDAV' && '-carddav' || '-caldav') || '' }}-endpoint.xml" "apps/dav/tests/testsuits/caldavtest/serverinfo.xml" pushd CalDAVTester - PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/travis/caldavtest" -o cdt.txt \ + PYTHONPATH="../pycalendar/src" python testcaldav.py --print-details-onfail --basedir "../apps/dav/tests/testsuits/caldavtest" -o cdt.txt \ "${{ matrix.service }}/current-user-principal.xml" \ "${{ matrix.service }}/sync-report.xml" \ ${{ matrix.endpoint == 'new' && format('{0}/sharing-{1}.xml', matrix.service, matrix.service == 'CalDAV' && 'calendars' || 'addressbooks') || ';' }} diff --git a/.reuse/dep5 b/.reuse/dep5 index 37dab9b376ade..6a528130022bf 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -71,7 +71,7 @@ Files: themes/example/core/img/favicon-touch.png themes/example/core/img/favicon Copyright: 2015 ownCloud, Inc., 2016 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-only -Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf +Files: tests/data/testapp.zip tests/data/testapp2.zip tests/docker/mariadb/oc.cnf apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf Copyright: 2016 ownCloud, Inc. License: AGPL-3.0-only @@ -147,7 +147,7 @@ Files: build/stubs/app_api.php build/stubs/SensitiveParameter.phpstub build/stub Copyright: 2023 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-or-later -Files: apps/dav/tests/misc/caldav-search-limit-timerange-1.ics apps/dav/tests/misc/caldav-search-limit-timerange-2.ics apps/dav/tests/misc/caldav-search-limit-timerange-3.ics apps/dav/tests/misc/caldav-search-limit-timerange-4.ics apps/dav/tests/misc/caldav-search-limit-timerange-5.ics apps/dav/tests/misc/caldav-search-limit-timerange-6.ics apps/dav/tests/misc/caldav-search-missing-start-1.ics apps/dav/tests/misc/caldav-search-missing-start-2.ics +Files: apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics Copyright: 2023 Nextcloud GmbH and Nextcloud contributors License: AGPL-3.0-or-later diff --git a/apps/dav/tests/misc/sharing.xml b/apps/dav/tests/misc/sharing.xml deleted file mode 100644 index 6aa94554d3452..0000000000000 --- a/apps/dav/tests/misc/sharing.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - principal:principals/admin - - - diff --git a/apps/dav/tests/travis/caldav/install.sh b/apps/dav/tests/testsuits/caldav/install.sh similarity index 100% rename from apps/dav/tests/travis/caldav/install.sh rename to apps/dav/tests/testsuits/caldav/install.sh diff --git a/apps/dav/tests/travis/caldav/script-new-endpoint.sh b/apps/dav/tests/testsuits/caldav/script-new-endpoint.sh similarity index 100% rename from apps/dav/tests/travis/caldav/script-new-endpoint.sh rename to apps/dav/tests/testsuits/caldav/script-new-endpoint.sh diff --git a/apps/dav/tests/travis/caldav/script-old-endpoint.sh b/apps/dav/tests/testsuits/caldav/script-old-endpoint.sh similarity index 100% rename from apps/dav/tests/travis/caldav/script-old-endpoint.sh rename to apps/dav/tests/testsuits/caldav/script-old-endpoint.sh diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/10.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/10.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/11.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/11.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/2.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/2.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/21.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/21.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/3.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/3.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/4.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/4.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/5.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/5.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/6.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/6.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/7.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/7.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/8.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/8.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics b/apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml diff --git a/apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml b/apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml similarity index 100% rename from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml rename to apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml similarity index 99% rename from apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml rename to apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml index abcae9d7894b3..524f2ef609d29 100644 --- a/apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml +++ b/apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml @@ -1,7 +1,6 @@ - +