From a48750a1a6f83d8af8379d37600c48aded170abc Mon Sep 17 00:00:00 2001 From: Artur Neumann Date: Tue, 18 Mar 2025 16:12:36 +0545 Subject: [PATCH] enable main API test suite to run in CI --- .woodpecker.star | 15 +++++++-------- ...expected-failures-API-on-decomposed-storage.md | 9 ++++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.woodpecker.star b/.woodpecker.star index 64c5a56df..8553b8df2 100644 --- a/.woodpecker.star +++ b/.woodpecker.star @@ -59,7 +59,7 @@ dirs = { "gobinTarPath": "/go/src/github.com/opencloud-eu/opencloud/go-bin.tar.gz", "opencloudConfig": "tests/config/woodpecker/opencloud-config.json", "ocis": "/woodpecker/src/github.com/opencloud-eu/opencloud/srv/app/tmp/ocis", - "ocisRevaDataRoot": "/woodpecker/src/github.com/opencloud-eu/opencloud/srv/app/tmp/ocis/owncloud/data", + "opencloudRevaDataRoot": "/woodpecker/src/github.com/opencloud-eu/opencloud/srv/app/tmp/ocis/owncloud/data", "multiServiceOcBaseDataPath": "/woodpecker/src/github.com/opencloud-eu/opencloud/multiServiceData", "ocWrapper": "/woodpecker/src/github.com/opencloud-eu/opencloud/tests/ocwrapper", "bannedPasswordList": "tests/config/woodpecker/banned-password-list.txt", @@ -301,7 +301,7 @@ config = { }, "apiTests": { "numberOfParts": 7, - "skip": True, + "skip": False, "skipExceptParts": [], }, "e2eTests": { @@ -1136,13 +1136,12 @@ def wopiValidatorTests(ctx, storage, wopiServerType, accounts_hash_difficulty = } def coreApiTests(ctx, part_number = 1, number_of_parts = 1, with_remote_php = False, accounts_hash_difficulty = 4): - filterTags = "~@skipOnGraph&&~@skipOnOcis-%s-Storage" % ("OC" if storage == "owncloud" else "OCIS") - test_dir = "%s/tests/acceptance" % dirs["base"] - expected_failures_file = "%s/expected-failures-API-on-decomposed-storage.md" % (test_dir) - storage = "decomposed" if "[posix]" in ctx.build.title.lower(): storage = "posix" + filterTags = "~@skipOnGraph&&~@skipOnOpencloud-%s-Storage" % storage + test_dir = "%s/tests/acceptance" % dirs["base"] + expected_failures_file = "%s/expected-failures-API-on-decomposed-storage.md" % (test_dir) return { "name": "Core-API-Tests-%s%s" % (part_number, "-withoutRemotePhp" if not with_remote_php else ""), @@ -1154,7 +1153,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, with_remote_php = Fa "image": OC_CI_PHP % DEFAULT_PHP_VERSION, "environment": { "TEST_SERVER_URL": OC_URL, - "OCIS_REVA_DATA_ROOT": "%s" % (dirs["ocisRevaDataRoot"] if storage == "owncloud" else ""), + "OC_REVA_DATA_ROOT": "%s" % (dirs["opencloudRevaDataRoot"] if storage == "owncloud" else ""), "SEND_SCENARIO_LINE_REFERENCES": True, "STORAGE_DRIVER": storage, "BEHAT_FILTER_TAGS": filterTags, @@ -1163,7 +1162,7 @@ def coreApiTests(ctx, part_number = 1, number_of_parts = 1, with_remote_php = Fa "ACCEPTANCE_TEST_TYPE": "core-api", "EXPECTED_FAILURES_FILE": expected_failures_file, "UPLOAD_DELETE_WAIT_TIME": "1" if storage == "owncloud" else 0, - "OCIS_WRAPPER_URL": "http://%s:5200" % OC_SERVER_NAME, + "OC_WRAPPER_URL": "http://%s:5200" % OC_SERVER_NAME, "WITH_REMOTE_PHP": with_remote_php, }, "commands": [ diff --git a/tests/acceptance/expected-failures-API-on-decomposed-storage.md b/tests/acceptance/expected-failures-API-on-decomposed-storage.md index dc2e5c45c..454f0185f 100644 --- a/tests/acceptance/expected-failures-API-on-decomposed-storage.md +++ b/tests/acceptance/expected-failures-API-on-decomposed-storage.md @@ -153,14 +153,21 @@ _ocdav: api compatibility, return correct status code_ - [coreApiTrashbin/trashbinSharingToShares.feature:277](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiTrashbin/trashbinSharingToShares.feature#L277) -#### [Uploading with the same mtime and filename causes "internal server errors"](https://github.com/owncloud/ocis/issues/10496) +#### [Uploading file with mtime gives 500 error](https://github.com/opencloud-eu/opencloud/issues/391) - [coreApiWebdavUpload/uploadFile.feature:400](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L400) - [coreApiWebdavUpload/uploadFile.feature:401](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L401) - [coreApiWebdavUpload/uploadFile.feature:402](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUpload/uploadFile.feature#L402) +- [coreApiWebdavUploadTUS/uploadFileMtime.feature:65](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L65) +- [coreApiWebdavUploadTUS/uploadFileMtime.feature:66](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L66) +- [coreApiWebdavUploadTUS/uploadFileMtime.feature:67](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L67) - [coreApiWebdavUploadTUS/uploadFileMtime.feature:79](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L79) - [coreApiWebdavUploadTUS/uploadFileMtime.feature:80](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L80) - [coreApiWebdavUploadTUS/uploadFileMtime.feature:81](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiWebdavUploadTUS/uploadFileMtime.feature#L81) +- [coreApiVersions/fileVersions.feature:296](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersions.feature#L296) +- [coreApiVersions/fileVersions.feature:297](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersions.feature#L297) +- [coreApiVersions/fileVersions.feature:298](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersions.feature#L298) +- [coreApiVersions/fileVersions.feature:301](https://github.com/opencloud-eu/opencloud/blob/main/tests/acceptance/features/coreApiVersions/fileVersions.feature#L301) ### Won't fix