Skip to content

Commit

Permalink
[tests-only] Bump core commit for API tests (#1339)
Browse files Browse the repository at this point in the history
* Bump core commit for API tests

* enable tus_support in the capabilities

* correct data_server_url

Co-authored-by: Artur Neumann <artur@jankaritech.com>
  • Loading branch information
phil-davis and individual-it authored Nov 26, 2020
1 parent 28be0ae commit 27afb32
Show file tree
Hide file tree
Showing 7 changed files with 65 additions and 22 deletions.
28 changes: 14 additions & 14 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: localAPIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -520,7 +520,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: localAPIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -589,7 +589,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -661,7 +661,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -733,7 +733,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -805,7 +805,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -877,7 +877,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -949,7 +949,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOcisStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1021,7 +1021,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1098,7 +1098,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1175,7 +1175,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1252,7 +1252,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1329,7 +1329,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down Expand Up @@ -1406,7 +1406,7 @@ steps:
- git clone -b master --depth=1 https://github.com/owncloud/testing.git /drone/src/tmp/testing
- git clone -b master --single-branch --no-tags https://github.com/owncloud/core.git /drone/src/tmp/testrunner
- cd /drone/src/tmp/testrunner
- git checkout 4def47445e6505ad4796dd7ee7b5035f230a6ca2
- git checkout 773cf3ea127430699f3bfb4c1b24e96a271a8884

- name: oC10APIAcceptanceTestsOwncloudStorage
image: owncloudci/php:7.4
Expand Down
20 changes: 17 additions & 3 deletions tests/acceptance/expected-failures-on-OCIS-storage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ apiSharePublicLink1/createPublicLinkShare.feature:793
apiSharePublicLink1/createPublicLinkShare.feature:804
#
# https://github.com/owncloud/product/issues/292 invalid format of sharees response
# https://github.com/owncloud/ocis/issues/547 Searching sharee with displayname
#
apiSharees/sharees.feature:32
apiSharees/sharees.feature:33
Expand Down Expand Up @@ -322,7 +323,7 @@ apiShareOperationsToShares/gettingShares.feature:39
#
# https://github.com/owncloud/ocis-reva/issues/357 Delete shares from user when user is deleted
# https://github.com/owncloud/ocis-reva/issues/301 no displayname_owner shown when creating a share
# https://github.com/owncloud/ocis-reva/issues/302 when sharing a file mime-type field is set to application/octet-stream
# https://github.com/owncloud/ocis/issues/578 when sharing a file mime-type field is set to application/octet-stream
#
apiShareOperationsToShares/gettingShares.feature:135
apiShareOperationsToShares/gettingShares.feature:136
Expand Down Expand Up @@ -517,7 +518,7 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
apiSharePublicLink2/updatePublicLinkShare.feature:284
apiSharePublicLink2/updatePublicLinkShare.feature:285
#
# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced
# https://github.com/owncloud/product/issues/270 [OCIS] share permissions not enforced
#
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26
Expand Down Expand Up @@ -840,7 +841,7 @@ apiShareReshareToShares3/reShareWithExpiryDate.feature:337
apiShareReshareToShares3/reShareWithExpiryDate.feature:338
#
# https://github.com/owncloud/product/issues/254 empty trashbin does not work
# https://github.com/owncloud/product/issues/254 delete from trashbin does not work
# https://github.com/owncloud/ocis/issues/551 delete from trashbin does not work
#
apiTrashbin/trashbinDelete.feature:31
apiTrashbin/trashbinDelete.feature:32
Expand Down Expand Up @@ -2215,3 +2216,16 @@ apiWebdavProperties1/copyFile.feature:306
apiWebdavProperties1/copyFile.feature:307
apiWebdavProperties1/copyFile.feature:329
apiWebdavProperties1/copyFile.feature:330

# https://github.com/owncloud/ocis/issues/772 requests to webdav URLs with an fileid containing an invalid storage_id result in error 500
apiVersions/fileVersions.feature:384

# https://github.com/owncloud/ocis/issues/771 requesting propfind with invalid fileid gives 502 error
apiVersions/fileVersions.feature:389

# https://github.com/owncloud/ocis/issues/760 user can access version metadata of a received share before accepting it
apiVersions/fileVersionsSharingToShares.feature:279

# https://github.com/owncloud/ocis/issues/719 when a share exists its impossible to share a renamed folder
apiShareManagementBasicToShares/createShareToSharesFolder.feature:611
apiShareManagementBasicToShares/createShareToSharesFolder.feature:612
21 changes: 18 additions & 3 deletions tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ apiFavorites/favoritesSharingToShares.feature:77
apiFavorites/favoritesSharingToShares.feature:78
#
# https://github.com/owncloud/product/issues/292 invalid format of sharees response
# https://github.com/owncloud/ocis/issues/547 Searching sharee with displayname
#
apiSharees/sharees.feature:32
apiSharees/sharees.feature:33
Expand Down Expand Up @@ -308,7 +309,7 @@ apiShareOperationsToShares/gettingShares.feature:39
#
# https://github.com/owncloud/ocis-reva/issues/357 Delete shares from user when user is deleted
# https://github.com/owncloud/ocis-reva/issues/301 no displayname_owner shown when creating a share
# https://github.com/owncloud/ocis-reva/issues/302 when sharing a file mime-type field is set to application/octet-stream
# https://github.com/owncloud/ocis/issues/578 when sharing a file mime-type field is set to application/octet-stream
#
apiShareOperationsToShares/gettingShares.feature:135
apiShareOperationsToShares/gettingShares.feature:136
Expand Down Expand Up @@ -389,6 +390,7 @@ apiSharePublicLink1/changingPublicLinkShare.feature:197
apiSharePublicLink1/changingPublicLinkShare.feature:244
#
# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions
# https://github.com/owncloud/ocis/issues/723 upload-only public link does not refer to files-drop page, nor are the permissions enforced
#
apiSharePublicLink1/changingPublicLinkShare.feature:267
apiSharePublicLink1/changingPublicLinkShare.feature:278
Expand Down Expand Up @@ -488,7 +490,7 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94
apiSharePublicLink2/updatePublicLinkShare.feature:284
apiSharePublicLink2/updatePublicLinkShare.feature:285
#
# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced
# https://github.com/owncloud/product/issues/270 [OCIS] share permissions not enforced
#
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25
apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26
Expand Down Expand Up @@ -809,7 +811,7 @@ apiShareReshareToShares3/reShareWithExpiryDate.feature:272
apiShareReshareToShares3/reShareWithExpiryDate.feature:273
#
# https://github.com/owncloud/product/issues/254 empty trashbin does not work
# https://github.com/owncloud/product/issues/254 delete from trashbin does not work
# https://github.com/owncloud/ocis/issues/551 delete from trashbin does not work
#
apiTrashbin/trashbinDelete.feature:31
apiTrashbin/trashbinDelete.feature:32
Expand Down Expand Up @@ -2152,3 +2154,16 @@ apiWebdavProperties1/copyFile.feature:306
apiWebdavProperties1/copyFile.feature:307
apiWebdavProperties1/copyFile.feature:329
apiWebdavProperties1/copyFile.feature:330

# https://github.com/owncloud/ocis/issues/772 requests to webdav URLs with an fileid containing an invalid storage_id result in error 500
apiVersions/fileVersions.feature:384

# https://github.com/owncloud/ocis/issues/771 requesting propfind with invalid fileid gives 502 error
apiVersions/fileVersions.feature:389

# https://github.com/owncloud/ocis/issues/760 user can access version metadata of a received share before accepting it
apiVersions/fileVersionsSharingToShares.feature:279

# https://github.com/owncloud/ocis/issues/719 when a share exists its impossible to share a renamed folder
apiShareManagementBasicToShares/createShareToSharesFolder.feature:611
apiShareManagementBasicToShares/createShareToSharesFolder.feature:612
7 changes: 7 additions & 0 deletions tests/oc-integration-tests/drone/frontend.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@ incoming = true

[http.services.ocs.capabilities.capabilities.notifications]
endpoints = ["disable"]

[http.services.ocs.capabilities.capabilities.files.tus_support]
version = "1.0.0"
resumable = "1.0.0"
extension = "creation,creation-with-upload"
http_method_override = ""
max_chunk_size = 0
2 changes: 1 addition & 1 deletion tests/oc-integration-tests/drone/storage-home-ocis.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ driver = "ocis"
mount_path = "/home"
mount_id = "123e4567-e89b-12d3-a456-426655440000"
expose_data_server = true
data_server_url = "http://localhost:12001/data"
data_server_url = "http://revad-services:12001/data"
enable_home_creation = true

[grpc.services.storageprovider.drivers.ocis]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ driver = "owncloud"
mount_path = "/home"
mount_id = "123e4567-e89b-12d3-a456-426655440000"
expose_data_server = true
data_server_url = "http://localhost:12001/data"
data_server_url = "http://revad-services:12001/data"
enable_home_creation = true

[grpc.services.storageprovider.drivers.owncloud]
Expand Down
7 changes: 7 additions & 0 deletions tests/oc-integration-tests/local/frontend.toml
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,10 @@ incoming = true

[http.services.ocs.capabilities.capabilities.notifications]
endpoints = ["disable"]

[http.services.ocs.capabilities.capabilities.files.tus_support]
version = "1.0.0"
resumable = "1.0.0"
extension = "creation,creation-with-upload"
http_method_override = ""
max_chunk_size = 0

0 comments on commit 27afb32

Please sign in to comment.