diff options
author | Ferdinand Thiessen <opensource@fthiessen.de> | 2024-09-19 23:26:39 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-09-19 23:26:39 +0200 |
commit | 2a59f4fc95305909b06f095fadb4770bfe8b3152 (patch) | |
tree | 021a379dedaa75afcb912a5699c0c7d3548b4e5d | |
parent | 8a8bbd4f9fc8b68f4cc73d50599b0f087612f0b9 (diff) | |
parent | 051ee7e7fd9c2563cf554a29ec790cef7066d609 (diff) | |
download | nextcloud-server-2a59f4fc95305909b06f095fadb4770bfe8b3152.tar.gz nextcloud-server-2a59f4fc95305909b06f095fadb4770bfe8b3152.zip |
Merge pull request #48220 from nextcloud/chore/remove-travis
chore: Remove old travis related stuff
-rw-r--r-- | .github/workflows/integration-dav.yml | 4 | ||||
-rw-r--r-- | .reuse/dep5 | 4 | ||||
-rw-r--r-- | apps/dav/tests/misc/sharing.xml | 11 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldav/install.sh (renamed from apps/dav/tests/travis/caldav/install.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldav/script-new-endpoint.sh (renamed from apps/dav/tests/travis/caldav/script-new-endpoint.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldav/script-old-endpoint.sh (renamed from apps/dav/tests/travis/caldav/script-old-endpoint.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/current-user-principal/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/2.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/2.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/3.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/3.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/4.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/4.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/5.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/5.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/put/6.txt (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/put/6.txt) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/10.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/10.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/11.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/11.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/2.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/2.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/21.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/21.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/3.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/3.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/4.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/4.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/5.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/5.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/6.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/6.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/7.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/7.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/reports/sync/8.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/reports/sync/8.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/4.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/5.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/6.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/7.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/8.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CalDAV/sharing/calendars/read-write/9.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/4.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/6.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/7.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/8.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/sharing/read-write/9.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vcurrent-user-principal/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/1.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/2.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/put/3.vcf) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/1.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml (renamed from apps/dav/tests/travis/caldavtest/data/Resource/CardDAV/vreports/sync/2.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml (renamed from apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml) | 3 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml (renamed from apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml) | 3 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml (renamed from apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml) | 3 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/serverinfo.dtd (renamed from apps/dav/tests/travis/caldavtest/serverinfo.dtd) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CalDAV/current-user-principal.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CalDAV/current-user-principal.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sharing-calendars.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sync-report.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CardDAV/current-user-principal.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CardDAV/current-user-principal.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sharing-addressbooks.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sync-report.xml (renamed from apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/carddav/install.sh (renamed from apps/dav/tests/travis/carddav/install.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/carddav/script-new-endpoint.sh (renamed from apps/dav/tests/travis/carddav/script-new-endpoint.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/carddav/script-old-endpoint.sh (renamed from apps/dav/tests/travis/carddav/script-old-endpoint.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/carddav/script.sh (renamed from apps/dav/tests/travis/carddav/script.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/litmus-v1/script.sh (renamed from apps/dav/tests/travis/litmus-v1/script.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/testsuits/litmus-v2/script.sh (renamed from apps/dav/tests/travis/litmus-v2/script.sh) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/CalDAV/CalDavBackendTest.php | 46 | ||||
-rw-r--r-- | apps/dav/tests/unit/phpunit.xml | 1 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-1.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-2.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-3.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-4.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-5.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics (renamed from apps/dav/tests/misc/caldav-search-limit-timerange-6.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics (renamed from apps/dav/tests/misc/caldav-search-missing-start-1.ics) | 0 | ||||
-rw-r--r-- | apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics (renamed from apps/dav/tests/misc/caldav-search-missing-start-2.ics) | 0 | ||||
-rw-r--r-- | apps/settings/.editorconfig | 2 | ||||
-rw-r--r-- | apps/updatenotification/Makefile | 1 | ||||
-rw-r--r-- | core/vendor/.gitignore | 1 | ||||
-rw-r--r-- | lib/private/legacy/OC_Util.php | 3 | ||||
-rw-r--r-- | tests/lib/TestCase.php | 5 | ||||
-rw-r--r-- | tests/travis/before_install.sh | 41 | ||||
-rwxr-xr-x | tests/travis/changed_app.sh | 19 | ||||
-rw-r--r-- | tests/travis/custom.ini | 6 | ||||
-rwxr-xr-x | tests/travis/install.sh | 182 |
80 files changed, 32 insertions, 303 deletions
diff --git a/.github/workflows/integration-dav.yml b/.github/workflows/integration-dav.yml index ce493ae42b1..41404a82297 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 37dab9b376a..6a528130022 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 6aa94554d34..00000000000 --- a/apps/dav/tests/misc/sharing.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8" ?> -<!-- - - SPDX-FileCopyrightText: 2015 ownCloud, Inc. - - SPDX-License-Identifier: AGPL-3.0-only - --> - <CS:share xmlns:D="DAV:" xmlns:CS="urn:ietf:params:xml:ns:carddav"> - <CS:set> - <D:href>principal:principals/admin</D:href> - <CS:read-write /> - </CS:set> - </CS:share> diff --git a/apps/dav/tests/travis/caldav/install.sh b/apps/dav/tests/testsuits/caldav/install.sh index ecbab3a1fd7..ecbab3a1fd7 100644 --- a/apps/dav/tests/travis/caldav/install.sh +++ b/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 index 91a78e97e35..91a78e97e35 100644 --- a/apps/dav/tests/travis/caldav/script-new-endpoint.sh +++ b/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 index cbe2d0d85fa..cbe2d0d85fa 100644 --- a/apps/dav/tests/travis/caldav/script-old-endpoint.sh +++ b/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 index b84d2cedf68..b84d2cedf68 100644 --- 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 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 index 2d0a3641ac4..2d0a3641ac4 100644 --- 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 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 index 3ac43b1d507..3ac43b1d507 100644 --- 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 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 index 67de0524ec3..67de0524ec3 100644 --- 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 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 index bfdc0dbd116..bfdc0dbd116 100644 --- 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 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 index be223854641..be223854641 100644 --- 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 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 index e1d701e2698..e1d701e2698 100644 --- 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 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 index ecabe13a707..ecabe13a707 100644 --- 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 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 index 343f73a6f84..343f73a6f84 100644 --- 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 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 index 494f75ff986..494f75ff986 100644 --- 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 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 index dffb0310eba..dffb0310eba 100644 --- 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 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 index fc8270bb8d8..fc8270bb8d8 100644 --- 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 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 index cfbb3ff6c5e..cfbb3ff6c5e 100644 --- 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 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 index 2ee8f3e0f3c..2ee8f3e0f3c 100644 --- 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 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 index 1b8f73c98b0..1b8f73c98b0 100644 --- 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 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 index 769ebb6907e..769ebb6907e 100644 --- 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 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 index 78c175c3f03..78c175c3f03 100644 --- 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 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 index b7aa5926c87..b7aa5926c87 100644 --- 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 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 index d61c413e2a4..d61c413e2a4 100644 --- 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 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 index 3be574add20..3be574add20 100644 --- 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 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 index 5c679977eb9..5c679977eb9 100644 --- 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 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 index ae21adac8b2..ae21adac8b2 100644 --- 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 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 index e13f1dd3cb1..e13f1dd3cb1 100644 --- 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 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 index 145f5f14c7b..145f5f14c7b 100644 --- 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 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 index c4e816210df..c4e816210df 100644 --- 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 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 index 2da72d2f601..2da72d2f601 100644 --- 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 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 index dfc21bb9c5b..dfc21bb9c5b 100644 --- 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 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 index 482682b12ec..482682b12ec 100644 --- 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 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 index 5c679977eb9..5c679977eb9 100644 --- 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 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 index 6b53f8ba3bf..6b53f8ba3bf 100644 --- 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 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 index 27fdb9fae5f..27fdb9fae5f 100644 --- 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 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 index 9188fdd913c..9188fdd913c 100644 --- 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 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 index 1ca0a36ca4c..1ca0a36ca4c 100644 --- 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 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 index d101bc698b5..d101bc698b5 100644 --- 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 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 index 2121c65f1f4..2121c65f1f4 100644 --- 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 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 index 390a3d8ae69..390a3d8ae69 100644 --- 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 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 index 37c3b81bdcf..37c3b81bdcf 100644 --- 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 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 index 8818cef1e29..8818cef1e29 100644 --- 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 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 index fc8270bb8d8..fc8270bb8d8 100644 --- 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 diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-new-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-new-endpoint.xml index abcae9d7894..524f2ef609d 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 @@ <?xml version="1.0" standalone="no"?> -<!DOCTYPE serverinfo SYSTEM - "/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd"> +<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd"> <!-- - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved. diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml index 7dc62ad1bed..c95efd2ca0d 100644 --- a/apps/dav/tests/travis/caldavtest/serverinfo-old-caldav-endpoint.xml +++ b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-caldav-endpoint.xml @@ -1,7 +1,6 @@ <?xml version="1.0" standalone="no"?> -<!DOCTYPE serverinfo SYSTEM - "/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd"> +<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd"> <!-- - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved. diff --git a/apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml index 6a45bab36dc..960cc8cdf17 100644 --- a/apps/dav/tests/travis/caldavtest/serverinfo-old-carddav-endpoint.xml +++ b/apps/dav/tests/testsuits/caldavtest/serverinfo-old-carddav-endpoint.xml @@ -1,7 +1,6 @@ <?xml version="1.0" standalone="no"?> -<!DOCTYPE serverinfo SYSTEM - "/home/deepdiver/Development/ownCloud/master/apps/dav/tests/travis/caldavtest/serverinfo.dtd"> +<!DOCTYPE serverinfo SYSTEM "./serverinfo.dtd"> <!-- - SPDX-FileCopyrightText: 2006-2015 Apple Inc. All rights reserved. diff --git a/apps/dav/tests/travis/caldavtest/serverinfo.dtd b/apps/dav/tests/testsuits/caldavtest/serverinfo.dtd index d3841e363ad..d3841e363ad 100644 --- a/apps/dav/tests/travis/caldavtest/serverinfo.dtd +++ b/apps/dav/tests/testsuits/caldavtest/serverinfo.dtd diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/current-user-principal.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/current-user-principal.xml index 79ccd50e01f..79ccd50e01f 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/current-user-principal.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/current-user-principal.xml diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sharing-calendars.xml index 97541025736..97541025736 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sharing-calendars.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sharing-calendars.xml diff --git a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sync-report.xml index ff4c0c170cd..ff4c0c170cd 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CalDAV/sync-report.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CalDAV/sync-report.xml diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/current-user-principal.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/current-user-principal.xml index fc120a092dd..fc120a092dd 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/current-user-principal.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/current-user-principal.xml diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sharing-addressbooks.xml index a9c1a84af44..a9c1a84af44 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sharing-addressbooks.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sharing-addressbooks.xml diff --git a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sync-report.xml index bdd3c58e93b..bdd3c58e93b 100644 --- a/apps/dav/tests/travis/caldavtest/tests/CardDAV/sync-report.xml +++ b/apps/dav/tests/testsuits/caldavtest/tests/CardDAV/sync-report.xml diff --git a/apps/dav/tests/travis/carddav/install.sh b/apps/dav/tests/testsuits/carddav/install.sh index 91c9079948d..91c9079948d 100644 --- a/apps/dav/tests/travis/carddav/install.sh +++ b/apps/dav/tests/testsuits/carddav/install.sh diff --git a/apps/dav/tests/travis/carddav/script-new-endpoint.sh b/apps/dav/tests/testsuits/carddav/script-new-endpoint.sh index f42876a0ade..f42876a0ade 100644 --- a/apps/dav/tests/travis/carddav/script-new-endpoint.sh +++ b/apps/dav/tests/testsuits/carddav/script-new-endpoint.sh diff --git a/apps/dav/tests/travis/carddav/script-old-endpoint.sh b/apps/dav/tests/testsuits/carddav/script-old-endpoint.sh index e5de79bfebb..e5de79bfebb 100644 --- a/apps/dav/tests/travis/carddav/script-old-endpoint.sh +++ b/apps/dav/tests/testsuits/carddav/script-old-endpoint.sh diff --git a/apps/dav/tests/travis/carddav/script.sh b/apps/dav/tests/testsuits/carddav/script.sh index 8261d3189bf..8261d3189bf 100644 --- a/apps/dav/tests/travis/carddav/script.sh +++ b/apps/dav/tests/testsuits/carddav/script.sh diff --git a/apps/dav/tests/travis/litmus-v1/script.sh b/apps/dav/tests/testsuits/litmus-v1/script.sh index d2da46904d4..d2da46904d4 100644 --- a/apps/dav/tests/travis/litmus-v1/script.sh +++ b/apps/dav/tests/testsuits/litmus-v1/script.sh diff --git a/apps/dav/tests/travis/litmus-v2/script.sh b/apps/dav/tests/testsuits/litmus-v2/script.sh index 8b425228efb..8b425228efb 100644 --- a/apps/dav/tests/travis/litmus-v2/script.sh +++ b/apps/dav/tests/testsuits/litmus-v2/script.sh diff --git a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php index c82ca350c90..61c03c9e4c1 100644 --- a/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php +++ b/apps/dav/tests/unit/CalDAV/CalDavBackendTest.php @@ -117,7 +117,7 @@ class CalDavBackendTest extends AbstractCalDavBackend { public function testCalendarSharing($userCanRead, $userCanWrite, $groupCanRead, $groupCanWrite, $add, $principals): void { $logger = $this->createMock(\Psr\Log\LoggerInterface::class); $config = $this->createMock(IConfig::class); - /** @var IL10N|MockObject $l10n */ + $l10n = $this->createMock(IL10N::class); $l10n->expects($this->any()) ->method('t') @@ -1655,12 +1655,12 @@ EOD; ]; $testFiles = [ - __DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', ]; foreach ($testFiles as $testFile) { @@ -1712,12 +1712,12 @@ EOD; ]; $testFiles = [ - __DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', ]; foreach ($testFiles as $testFile) { @@ -1762,12 +1762,12 @@ EOD; ]; $testFiles = [ - __DIR__ . '/../../misc/caldav-search-limit-timerange-1.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-2.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-3.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-4.ics', - __DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional! - __DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-1.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-2.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-3.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-4.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional! + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics', ]; foreach ($testFiles as $testFile) { @@ -1819,10 +1819,10 @@ EOD; ]; $testFiles = [ - __DIR__ . '/../../misc/caldav-search-limit-timerange-6.ics', // <-- intentional! - __DIR__ . '/../../misc/caldav-search-limit-timerange-5.ics', - __DIR__ . '/../../misc/caldav-search-missing-start-1.ics', - __DIR__ . '/../../misc/caldav-search-missing-start-2.ics', + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-6.ics', // <-- intentional! + __DIR__ . '/../test_fixtures/caldav-search-limit-timerange-5.ics', + __DIR__ . '/../test_fixtures/caldav-search-missing-start-1.ics', + __DIR__ . '/../test_fixtures/caldav-search-missing-start-2.ics', ]; foreach ($testFiles as $testFile) { diff --git a/apps/dav/tests/unit/phpunit.xml b/apps/dav/tests/unit/phpunit.xml index 0d08d8fe5d6..c85d07c6fcb 100644 --- a/apps/dav/tests/unit/phpunit.xml +++ b/apps/dav/tests/unit/phpunit.xml @@ -26,4 +26,3 @@ <log type="coverage-clover" target="./clover.xml"/> </logging> </phpunit> - diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-1.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics index e76ac3c9b2f..e76ac3c9b2f 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-1.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-1.ics diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-2.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics index fe948321d51..fe948321d51 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-2.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-2.ics diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-3.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics index de7765b28d2..de7765b28d2 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-3.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-3.ics diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-4.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics index b4d2f752c0a..b4d2f752c0a 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-4.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-4.ics diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-5.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics index 1cd8b7ebf13..1cd8b7ebf13 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-5.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-5.ics diff --git a/apps/dav/tests/misc/caldav-search-limit-timerange-6.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics index 6c24d534281..6c24d534281 100644 --- a/apps/dav/tests/misc/caldav-search-limit-timerange-6.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-limit-timerange-6.ics diff --git a/apps/dav/tests/misc/caldav-search-missing-start-1.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics index a7865eaf5ef..a7865eaf5ef 100644 --- a/apps/dav/tests/misc/caldav-search-missing-start-1.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-1.ics diff --git a/apps/dav/tests/misc/caldav-search-missing-start-2.ics b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics index 4a33f2b1c8a..4a33f2b1c8a 100644 --- a/apps/dav/tests/misc/caldav-search-missing-start-2.ics +++ b/apps/dav/tests/unit/test_fixtures/caldav-search-missing-start-2.ics diff --git a/apps/settings/.editorconfig b/apps/settings/.editorconfig index e9391ffef4d..fab810415cf 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 6db98f27cac..b64cd1a6290 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 1d5553f369a..478ced55415 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 0c8fcc56f32..a6478ae11f8 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -545,8 +545,7 @@ class OC_Util { // 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 d74dacd76c1..cfed2b06c61 100644 --- a/tests/lib/TestCase.php +++ b/tests/lib/TestCase.php @@ -533,11 +533,6 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase { } 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 b05e93e856f..00000000000 --- 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 59410788bd9..00000000000 --- 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 6eea6fb5cec..00000000000 --- 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 bfedb45caa3..00000000000 --- 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 <<DELIM -<?php -\$AUTOCONFIG = array ( - 'installed' => false, - 'dbtype' => 'sqlite', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', -); -DELIM - -cat > ./tests/autoconfig-mysql.php <<DELIM -<?php -\$AUTOCONFIG = array ( - 'installed' => 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 <<DELIM -<?php -\$AUTOCONFIG = array ( - 'installed' => false, - 'dbtype' => 'pgsql', - 'dbtableprefix' => 'oc_', - 'adminlogin' => '$ADMINLOGIN', - 'adminpass' => 'admin', - 'directory' => '$DATADIR', - 'dbuser' => '$DATABASEUSER', - 'dbname' => '$DATABASENAME', - 'dbhost' => 'localhost', - 'dbpass' => '', -); -DELIM - -cat > ./tests/autoconfig-oracle.php <<DELIM -<?php -\$AUTOCONFIG = array ( - 'installed' => 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 <<EOF - create user $DATABASENAME identified by owncloud; - alter user $DATABASENAME default tablespace users - temporary tablespace temp - quota unlimited on users; - grant create session - , create table - , create procedure - , create sequence - , create trigger - , create view - , create synonym - , alter session - to $DATABASENAME; - exit; -EOF - fi - - # copy autoconfig - cp $BASEDIR/tests/autoconfig-$1.php $BASEDIR/config/autoconfig.php - - # trigger installation - echo "INDEX" - php -f index.php - echo "END INDEX" - - #test execution - cd tests - #php -f enable_all.php -} - -# -# start test execution -# -if [ -z "$1" ] - then - # run all known database configs - for DBCONFIG in $DBCONFIGS; do - execute_tests $DBCONFIG - done -else - execute_tests $1 $2 $3 -fi - -# show environment -echo "owncloud configuration:" -cat $BASEDIR/config/config.php - - -echo "data directory:" -ls -ll $DATADIR - -echo "nextcloud.log:" -[ -f "$DATADIR/nextcloud.log" ] && cat $DATADIR/nextcloud.log -[ -f "$BASEDIR/data/nextcloud.log" ] && cat $BASEDIR/data/nextcloud.log - -cd $BASEDIR |