Skip to content

Commit

Permalink
Removed unused make target, bump ocis commit id
Browse files Browse the repository at this point in the history
  • Loading branch information
@grgprarup
grgprarup committed Jan 26, 2023
1 parent 74afdca commit b13ef65
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 65 deletions.
3 changes: 2 additions & 1 deletion .drone.env
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# The test runner source for API tests
APITESTS_COMMITID=6357a703181b368e2109f720e0785a11222eed88
APITESTS_COMMITID=6c0a5baec09e7f0716c55f58d7263d6943e95f89
APITESTS_BRANCH=master
APITESTS_REPO_GIT_URL=https://github.com/owncloud/ocis.git
11 changes: 5 additions & 6 deletions .drone.star
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def cloneApiTestReposStep():
"commands": [
"source /drone/src/.drone.env",
"git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing",
"git clone -b $APITESTS_BRANCH --single-branch --no-tags https://github.com/owncloud/ocis.git /drone/src/tmp/testrunner",
"git clone -b $APITESTS_BRANCH --single-branch --no-tags $APITESTS_REPO_GIT_URL /drone/src/tmp/testrunner",
"cd /drone/src/tmp/testrunner",
"git checkout $APITESTS_COMMITID",
],
Expand Down Expand Up @@ -108,13 +108,12 @@ def virtualViews():
"name": "APIAcceptanceTestsOcisStorage",
"image": OC_CI_PHP,
"commands": [
"cd /drone/src",
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-api",
"make test-acceptance-from-core-api",
],
"environment": {
"PATH_TO_APITESTS": "/drone/src/tmp/testrunner",
"TEST_SERVER_URL": "http://revad-services:20180",
"OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/",
"DELETE_USER_DATA_CMD": "rm -rf /drone/src/tmp/reva/data/nodes/root/* /drone/src/tmp/reva/data/nodes/*-*-*-* /drone/src/tmp/reva/data/blobs/*",
Expand Down Expand Up @@ -178,7 +177,7 @@ def ocisIntegrationTests(parallelRuns, skipExceptParts = []):
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-core-api",
"make test-acceptance-from-core-api",
],
"environment": {
"TEST_SERVER_URL": "http://revad-services:20080",
Expand Down Expand Up @@ -254,7 +253,7 @@ def s3ngIntegrationTests(parallelRuns, skipExceptParts = []):
"cd /drone/src/tmp/testrunner",
"composer self-update",
"composer --version",
"make test-acceptance-core-api",
"make test-acceptance-from-core-api",
],
"environment": {
"TEST_SERVER_URL": "http://revad-services:20080",
Expand Down
10 changes: 0 additions & 10 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,16 +141,6 @@ clean: toolchain-clean
dist: gen-doc
go run tools/create-artifacts/main.go -version ${VERSION} -commit ${GIT_COMMIT} -goversion ${GO_VERSION}

BEHAT_BIN=vendor-bin/behat/vendor/bin/behat
# behat config file for core api tests
CORE_BEHAT_YML=$(PATH_TO_APITESTS)/tests/acceptance/config/behat-core.yml

test-acceptance-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type api

test-acceptance-core-api: vendor-bin/behat/vendor
BEHAT_BIN=$(BEHAT_BIN) BEHAT_YML=$(CORE_BEHAT_YML) $(PATH_TO_APITESTS)/tests/acceptance/run.sh --type core-api

vendor/bamarni/composer-bin-plugin: composer.lock
composer install

Expand Down
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
../../../cmd/revad/revad -c ldap-users.toml
```
3. clone ownCloud 10
3. clone ownCloud Infinite Scale `OCIS`
```
git clone https://github.com/owncloud/core.git ./testrunner
git clone https://github.com/owncloud/ocis.git ./testrunner
```
4. to run the correct version of the testsuite check out the commit id from the `.drone.env` file
Expand All @@ -158,7 +158,7 @@ This will require some PHP-related tools to run, for instance on Ubuntu you will
TEST_REVA='true' \
BEHAT_FILTER_TAGS='~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@provisioning_api-app-required&&~@preview-extension-required&&~@local_storage&&~@skipOnOcis-OCIS-Storage&&~@skipOnOcis' \
EXPECTED_FAILURES_FILE=../reva/tests/acceptance/expected-failures-on-OCIS-storage.md \
make test-acceptance-api
make test-acceptance-from-core-api
```
This will run all tests that are relevant to reva.
Expand Down
33 changes: 13 additions & 20 deletions tests/acceptance/expected-failures-on-OCIS-storage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -318,11 +318,6 @@ _requires a [CS3 user provisioning api that can update the quota for a user](htt
- [coreApiShareManagementToShares/acceptShares.feature:532](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L532)
- [coreApiVersions/fileVersionsSharingToShares.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L44)

#### [not possible to move file into a received folder](https://github.com/owncloud/ocis/issues/764)

- [coreApiVersions/fileVersionsSharingToShares.feature:220](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L220)
- [coreApiVersions/fileVersionsSharingToShares.feature:221](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L221)

#### [Expiration date for shares is not implemented](https://github.com/owncloud/ocis/issues/1250)
#### Expiration date of user shares

Expand Down Expand Up @@ -497,7 +492,7 @@ _requires a [CS3 user provisioning api that can update the quota for a user](htt
- [coreApiShareUpdateToShares/updateShare.feature:282](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L282)

#### [user can access version metadata of a received share before accepting it](https://github.com/owncloud/ocis/issues/760)
- [coreApiVersions/fileVersionsSharingToShares.feature:283](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L283)
- [coreApiVersions/fileVersions.feature:487](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L487)

#### [Share lists deleted user as 'user'](https://github.com/owncloud/ocis/issues/903)
- [coreApiShareManagementBasicToShares/createShareToSharesFolder.feature:682](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature#L682)
Expand Down Expand Up @@ -784,15 +779,19 @@ _ocs: api compatibility, return correct status code_
- [coreApiVersions/fileVersionsSharingToShares.feature:306](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L306)

#### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914)
- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14)
- [coreApiVersions/fileVersionAuthor.feature:37](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L37)
- [coreApiVersions/fileVersionAuthor.feature:58](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L58)
- [coreApiVersions/fileVersionAuthor.feature:78](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L78)
- [coreApiVersions/fileVersionAuthor.feature:104](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L104)
- [coreApiVersions/fileVersionAuthor.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L129)
- [coreApiVersions/fileVersionAuthor.feature:154](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L154)
- [coreApiVersions/fileVersionAuthor.feature:180](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L180)
- [coreApiVersions/fileVersionAuthor.feature:13](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L13)
- [coreApiVersions/fileVersionAuthor.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L44)
- [coreApiVersions/fileVersionAuthor.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L71)
- [coreApiVersions/fileVersionAuthor.feature:97](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L97)
- [coreApiVersions/fileVersionAuthor.feature:130](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L130)
- [coreApiVersions/fileVersionAuthor.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L157)
- [coreApiVersions/fileVersionAuthor.feature:188](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L188)
- [coreApiVersions/fileVersionAuthor.feature:223](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L223)
- [coreApiVersions/fileVersionAuthor.feature:275](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L275)
- [coreApiVersions/fileVersionAuthor.feature:324](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L324)
- [coreApiVersions/fileVersionAuthor.feature:345](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L345)
- [coreApiVersions/fileVersionAuthor.feature:365](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L365)
- [coreApiVersions/fileVersionAuthor.feature:390](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L390)

#### [Allow public link sharing only for certain groups feature not implemented](https://github.com/owncloud/ocis/issues/4623)
- [coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature:35](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiSharePublicLink3/allowGroupToCreatePublicLinks.feature#L35)
Expand Down Expand Up @@ -835,12 +834,6 @@ _ocs: api compatibility, return correct status code_
- [coreApiWebdavMove2/moveFileToBlacklistedName.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature#L74)
- [coreApiWebdavMove2/moveFileToBlacklistedName.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature#L75)


#### [could not create system tag](https://github.com/owncloud/ocis/issues/3092)
- [coreApiWebdavOperations/search.feature:274](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L274)
- [coreApiWebdavOperations/search.feature:291](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L291)
- [coreApiWebdavOperations/search.feature:317](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L317)

#### [resource path is included in the returned error message](https://github.com/owncloud/ocis/issues/3344)
- [coreApiWebdavProperties2/getFileProperties.feature:324](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature#L324)

Expand Down
31 changes: 13 additions & 18 deletions tests/acceptance/expected-failures-on-S3NG-storage.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,19 @@ Basic file management like up and download, move, copy, properties, quota, trash
- [coreApiVersions/fileVersionsSharingToShares.feature:306](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L306)

#### [file versions do not report the version author](https://github.com/owncloud/ocis/issues/2914)
- [coreApiVersions/fileVersionAuthor.feature:14](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L14)
- [coreApiVersions/fileVersionAuthor.feature:37](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L37)
- [coreApiVersions/fileVersionAuthor.feature:58](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L58)
- [coreApiVersions/fileVersionAuthor.feature:78](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L78)
- [coreApiVersions/fileVersionAuthor.feature:104](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L104)
- [coreApiVersions/fileVersionAuthor.feature:129](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L129)
- [coreApiVersions/fileVersionAuthor.feature:154](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L154)
- [coreApiVersions/fileVersionAuthor.feature:180](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L180)
- [coreApiVersions/fileVersionAuthor.feature:13](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L13)
- [coreApiVersions/fileVersionAuthor.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L44)
- [coreApiVersions/fileVersionAuthor.feature:71](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L71)
- [coreApiVersions/fileVersionAuthor.feature:97](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L97)
- [coreApiVersions/fileVersionAuthor.feature:130](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L130)
- [coreApiVersions/fileVersionAuthor.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L157)
- [coreApiVersions/fileVersionAuthor.feature:188](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L188)
- [coreApiVersions/fileVersionAuthor.feature:223](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L223)
- [coreApiVersions/fileVersionAuthor.feature:275](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L275)
- [coreApiVersions/fileVersionAuthor.feature:324](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L324)
- [coreApiVersions/fileVersionAuthor.feature:345](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L345)
- [coreApiVersions/fileVersionAuthor.feature:365](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L365)
- [coreApiVersions/fileVersionAuthor.feature:390](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionAuthor.feature#L390)

#### [Getting information about a folder overwritten by a file gives 500 error instead of 404](https://github.com/owncloud/ocis/issues/1239)
- [coreApiWebdavProperties1/copyFile.feature:274](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavProperties1/copyFile.feature#L274)
Expand Down Expand Up @@ -333,10 +337,6 @@ _requires a [CS3 user provisioning api that can update the quota for a user](htt
- [coreApiShareManagementToShares/acceptShares.feature:532](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareManagementToShares/acceptShares.feature#L532)
- [coreApiVersions/fileVersionsSharingToShares.feature:44](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L44)

####[not possible to move file into a received folder](https://github.com/owncloud/ocis/issues/764)
- [coreApiVersions/fileVersionsSharingToShares.feature:220](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L220)
- [coreApiVersions/fileVersionsSharingToShares.feature:221](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L221)

#### [Expiration date for shares is not implemented](https://github.com/owncloud/ocis/issues/1250)
#### Expiration date of user shares

Expand Down Expand Up @@ -511,7 +511,7 @@ _requires a [CS3 user provisioning api that can update the quota for a user](htt
- [coreApiShareUpdateToShares/updateShare.feature:282](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareUpdateToShares/updateShare.feature#L282)

#### [user can access version metadata of a received share before accepting it](https://github.com/owncloud/ocis/issues/760)
- [coreApiVersions/fileVersionsSharingToShares.feature:283](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersionsSharingToShares.feature#L283)
- [coreApiVersions/fileVersions.feature:487](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiVersions/fileVersions.feature#L487)

#### [Share lists deleted user as 'user'](https://github.com/owncloud/ocis/issues/903)
- [coreApiShareManagementBasicToShares/createShareToSharesFolder.feature:682](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiShareManagementBasicToShares/createShareToSharesFolder.feature#L682)
Expand Down Expand Up @@ -835,11 +835,6 @@ _ocs: api compatibility, return correct status code_
- [coreApiWebdavMove2/moveFileToBlacklistedName.feature:74](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature#L74)
- [coreApiWebdavMove2/moveFileToBlacklistedName.feature:75](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavMove2/moveFileToBlacklistedName.feature#L75)

#### [could not create system tag](https://github.com/owncloud/ocis/issues/3092)
- [coreApiWebdavOperations/search.feature:274](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L274)
- [coreApiWebdavOperations/search.feature:291](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L291)
- [coreApiWebdavOperations/search.feature:317](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavOperations/search.feature#L317)

#### [resource path is included in the returned error message](https://github.com/owncloud/ocis/issues/3344)
- [coreApiWebdavProperties2/getFileProperties.feature:324](https://github.com/owncloud/core/blob/master/tests/acceptance/features/coreApiWebdavProperties2/getFileProperties.feature#L324)

Expand Down
Loading

0 comments on commit b13ef65

Please sign in to comment.