From 249a3f27e7493ce734e8cadac38a6d982300fb25 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 13 Jan 2021 21:18:45 +0545 Subject: [PATCH 1/2] Bump core and web commit ids for tests --- .drone.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index 307cd2d39c..e8e5f7c0b1 100644 --- a/.drone.env +++ b/.drone.env @@ -1,7 +1,7 @@ # The test runner source for API tests -CORE_COMMITID=85da111d5ec5660f7294a789304b4bfc32580d95 +CORE_COMMITID=703437fc76dfb46de2dbc9d68331cb4027e02c53 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=467733e26d4bda42896f89f2768929b22b7c3815 +WEB_COMMITID=c4e54241ca7fd949e2ef764fc5363e886515132a WEB_BRANCH=master From 8062a01269ba1c171ea44814094c6ac44051b09e Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Thu, 14 Jan 2021 00:45:38 +0545 Subject: [PATCH 2/2] Adjust expected-failures --- .../expected-failures-API-on-OCIS-storage.txt | 44 ++++++++++++------- ...ected-failures-API-on-OWNCLOUD-storage.txt | 44 ++++++++++++------- ...ted-failures-webUI-on-OWNCLOUD-storage.txt | 3 ++ 3 files changed, 57 insertions(+), 34 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.txt b/tests/acceptance/expected-failures-API-on-OCIS-storage.txt index dfc6a777a3..ee6008fef8 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.txt +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.txt @@ -208,10 +208,18 @@ apiProvisioning-v2/apiProvisioningUsingAppPassword.feature:67 # apiProvisioning-v1/disableUser.feature:99 apiProvisioning-v1/disableUser.feature:129 +apiProvisioning-v1/disableUser.feature:165 +apiProvisioning-v1/disableUser.feature:172 +apiProvisioning-v1/disableUser.feature:190 +apiProvisioning-v1/disableUser.feature:203 apiProvisioning-v2/disableUser.feature:79 apiProvisioning-v2/disableUser.feature:99 apiProvisioning-v2/disableUser.feature:108 apiProvisioning-v2/disableUser.feature:130 +apiProvisioning-v2/disableUser.feature:166 +apiProvisioning-v2/disableUser.feature:173 +apiProvisioning-v2/disableUser.feature:191 +apiProvisioning-v2/disableUser.feature:204 # # https://github.com/owncloud/ocis-ocs/issues/51 # displayname of user can be changed to empty @@ -598,10 +606,12 @@ apiSharePublicLink2/copyFromPublicLink.feature:182 apiSharePublicLink2/copyFromPublicLink.feature:183 apiSharePublicLink2/updatePublicLinkShare.feature:44 apiSharePublicLink2/updatePublicLinkShare.feature:45 -apiSharePublicLink2/updatePublicLinkShare.feature:93 -apiSharePublicLink2/updatePublicLinkShare.feature:94 -apiSharePublicLink2/updatePublicLinkShare.feature:284 -apiSharePublicLink2/updatePublicLinkShare.feature:285 +apiSharePublicLink2/updatePublicLinkShare.feature:114 +apiSharePublicLink2/updatePublicLinkShare.feature:115 +apiSharePublicLink2/updatePublicLinkShare.feature:130 +apiSharePublicLink2/updatePublicLinkShare.feature:131 +apiSharePublicLink2/updatePublicLinkShare.feature:321 +apiSharePublicLink2/updatePublicLinkShare.feature:322 # # https://github.com/owncloud/product/issues/270 [OCIS] share permissions not enforced # @@ -625,27 +635,27 @@ apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115 # # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work # -apiSharePublicLink2/updatePublicLinkShare.feature:303 -apiSharePublicLink2/updatePublicLinkShare.feature:304 -apiSharePublicLink2/updatePublicLinkShare.feature:322 -apiSharePublicLink2/updatePublicLinkShare.feature:323 +apiSharePublicLink2/updatePublicLinkShare.feature:340 apiSharePublicLink2/updatePublicLinkShare.feature:341 -apiSharePublicLink2/updatePublicLinkShare.feature:342 +apiSharePublicLink2/updatePublicLinkShare.feature:359 apiSharePublicLink2/updatePublicLinkShare.feature:360 -apiSharePublicLink2/updatePublicLinkShare.feature:361 +apiSharePublicLink2/updatePublicLinkShare.feature:378 apiSharePublicLink2/updatePublicLinkShare.feature:379 -apiSharePublicLink2/updatePublicLinkShare.feature:380 +apiSharePublicLink2/updatePublicLinkShare.feature:397 apiSharePublicLink2/updatePublicLinkShare.feature:398 -apiSharePublicLink2/updatePublicLinkShare.feature:399 +apiSharePublicLink2/updatePublicLinkShare.feature:416 apiSharePublicLink2/updatePublicLinkShare.feature:417 -apiSharePublicLink2/updatePublicLinkShare.feature:418 -apiSharePublicLink2/updatePublicLinkShare.feature:439 -apiSharePublicLink2/updatePublicLinkShare.feature:440 +apiSharePublicLink2/updatePublicLinkShare.feature:435 +apiSharePublicLink2/updatePublicLinkShare.feature:436 +apiSharePublicLink2/updatePublicLinkShare.feature:454 +apiSharePublicLink2/updatePublicLinkShare.feature:455 +apiSharePublicLink2/updatePublicLinkShare.feature:476 +apiSharePublicLink2/updatePublicLinkShare.feature:477 # # https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions # -apiSharePublicLink2/updatePublicLinkShare.feature:486 -apiSharePublicLink2/updatePublicLinkShare.feature:487 +apiSharePublicLink2/updatePublicLinkShare.feature:523 +apiSharePublicLink2/updatePublicLinkShare.feature:524 apiSharePublicLink2/uploadToPublicLinkShare.feature:9 apiSharePublicLink2/uploadToPublicLinkShare.feature:83 apiSharePublicLink2/uploadToPublicLinkShare.feature:103 diff --git a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt index 7c2fab1a52..b1fbc4d379 100644 --- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.txt @@ -191,10 +191,18 @@ apiProvisioning-v2/apiProvisioningUsingAppPassword.feature:67 # apiProvisioning-v1/disableUser.feature:99 apiProvisioning-v1/disableUser.feature:129 +apiProvisioning-v1/disableUser.feature:165 +apiProvisioning-v1/disableUser.feature:172 +apiProvisioning-v1/disableUser.feature:190 +apiProvisioning-v1/disableUser.feature:203 apiProvisioning-v2/disableUser.feature:79 apiProvisioning-v2/disableUser.feature:99 apiProvisioning-v2/disableUser.feature:108 apiProvisioning-v2/disableUser.feature:130 +apiProvisioning-v2/disableUser.feature:166 +apiProvisioning-v2/disableUser.feature:173 +apiProvisioning-v2/disableUser.feature:191 +apiProvisioning-v2/disableUser.feature:204 # # https://github.com/owncloud/ocis-ocs/issues/51 # displayname of user can be changed to empty @@ -560,10 +568,12 @@ apiSharePublicLink2/copyFromPublicLink.feature:182 apiSharePublicLink2/copyFromPublicLink.feature:183 apiSharePublicLink2/updatePublicLinkShare.feature:44 apiSharePublicLink2/updatePublicLinkShare.feature:45 -apiSharePublicLink2/updatePublicLinkShare.feature:93 -apiSharePublicLink2/updatePublicLinkShare.feature:94 -apiSharePublicLink2/updatePublicLinkShare.feature:284 -apiSharePublicLink2/updatePublicLinkShare.feature:285 +apiSharePublicLink2/updatePublicLinkShare.feature:114 +apiSharePublicLink2/updatePublicLinkShare.feature:115 +apiSharePublicLink2/updatePublicLinkShare.feature:130 +apiSharePublicLink2/updatePublicLinkShare.feature:131 +apiSharePublicLink2/updatePublicLinkShare.feature:321 +apiSharePublicLink2/updatePublicLinkShare.feature:322 # # https://github.com/owncloud/product/issues/270 [OCIS] share permissions not enforced # @@ -596,27 +606,27 @@ apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115 # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work # apiShareManagementBasicToShares/createShareToSharesFolder.feature:367 -apiSharePublicLink2/updatePublicLinkShare.feature:303 -apiSharePublicLink2/updatePublicLinkShare.feature:304 -apiSharePublicLink2/updatePublicLinkShare.feature:322 -apiSharePublicLink2/updatePublicLinkShare.feature:323 +apiSharePublicLink2/updatePublicLinkShare.feature:340 apiSharePublicLink2/updatePublicLinkShare.feature:341 -apiSharePublicLink2/updatePublicLinkShare.feature:342 +apiSharePublicLink2/updatePublicLinkShare.feature:359 apiSharePublicLink2/updatePublicLinkShare.feature:360 -apiSharePublicLink2/updatePublicLinkShare.feature:361 +apiSharePublicLink2/updatePublicLinkShare.feature:378 apiSharePublicLink2/updatePublicLinkShare.feature:379 -apiSharePublicLink2/updatePublicLinkShare.feature:380 +apiSharePublicLink2/updatePublicLinkShare.feature:397 apiSharePublicLink2/updatePublicLinkShare.feature:398 -apiSharePublicLink2/updatePublicLinkShare.feature:399 +apiSharePublicLink2/updatePublicLinkShare.feature:416 apiSharePublicLink2/updatePublicLinkShare.feature:417 -apiSharePublicLink2/updatePublicLinkShare.feature:418 -apiSharePublicLink2/updatePublicLinkShare.feature:439 -apiSharePublicLink2/updatePublicLinkShare.feature:440 +apiSharePublicLink2/updatePublicLinkShare.feature:435 +apiSharePublicLink2/updatePublicLinkShare.feature:436 +apiSharePublicLink2/updatePublicLinkShare.feature:454 +apiSharePublicLink2/updatePublicLinkShare.feature:455 +apiSharePublicLink2/updatePublicLinkShare.feature:476 +apiSharePublicLink2/updatePublicLinkShare.feature:477 # # https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions # -apiSharePublicLink2/updatePublicLinkShare.feature:486 -apiSharePublicLink2/updatePublicLinkShare.feature:487 +apiSharePublicLink2/updatePublicLinkShare.feature:523 +apiSharePublicLink2/updatePublicLinkShare.feature:524 apiSharePublicLink2/uploadToPublicLinkShare.feature:9 apiSharePublicLink2/uploadToPublicLinkShare.feature:83 apiSharePublicLink2/uploadToPublicLinkShare.feature:103 diff --git a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt index 780c209a09..b7f6696bfa 100644 --- a/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-webUI-on-OWNCLOUD-storage.txt @@ -418,3 +418,6 @@ webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:122 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:298 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:275 webUISharingPublicDifferentRoles/shareByPublicLinkDifferentRoles.feature:212 +# +# https://github.com/owncloud/web/issues/4192 renamed file cannot be shared +webUISharingInternalUsers/shareWithUsers.feature:595