From ce120f78b85daaf6a29509ef081ccb6d4a6e0b90 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 2 Nov 2020 17:11:19 +0545 Subject: [PATCH] [tests-only] bump core commit id (#1290) * bump core commit id * Use PHP 7.4 for behat acceptance test runner --- .drone.yml | 84 +++++++++---------- composer.json | 2 +- .../expected-failures-on-OCIS-storage.txt | 56 +++++++------ .../expected-failures-on-OWNCLOUD-storage.txt | 56 +++++++------ vendor-bin/behat/composer.json | 2 +- 5 files changed, 108 insertions(+), 92 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8f0d9cccac..95ff6fa27d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -441,15 +441,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: localAPIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - make test-acceptance-api environment: @@ -516,15 +516,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: localAPIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - make test-acceptance-api environment: @@ -586,15 +586,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -659,15 +659,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -732,15 +732,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -805,15 +805,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -878,15 +878,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -951,15 +951,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOcisStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1024,15 +1024,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1102,15 +1102,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1180,15 +1180,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1258,15 +1258,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1336,15 +1336,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api @@ -1414,15 +1414,15 @@ steps: - /drone/src/cmd/revad/revad -c ldap-users.toml - name: clone-oC10-test-repos - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - 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 47365d22af95d90fcbd7705572f715a7b93d31b6 + - git checkout 8fee3047cadfaae5a4cee330a102af8d1ada8160 - name: oC10APIAcceptanceTestsOwncloudStorage - image: owncloudci/php:7.2 + image: owncloudci/php:7.4 commands: - cd /drone/src/tmp/testrunner - make test-acceptance-api diff --git a/composer.json b/composer.json index f470d1f706..baf6cc33f1 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "cs3org/reva", "config" : { "platform": { - "php": "7.2" + "php": "7.4" } }, "require": { diff --git a/tests/acceptance/expected-failures-on-OCIS-storage.txt b/tests/acceptance/expected-failures-on-OCIS-storage.txt index 8223e7b113..13548f9be7 100644 --- a/tests/acceptance/expected-failures-on-OCIS-storage.txt +++ b/tests/acceptance/expected-failures-on-OCIS-storage.txt @@ -514,26 +514,38 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94 apiSharePublicLink2/updatePublicLinkShare.feature:284 apiSharePublicLink2/updatePublicLinkShare.feature:285 # -# https://github.com/owncloud/ocis/issues/776 investigate ocis issues in apiSharePublicLink2/reShareAsPublicLinkToShares -# -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185 +# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced +# +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:62 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:63 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:77 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:78 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:136 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:137 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180 +# +# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions +# +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:97 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:98 +# +# https://github.com/owncloud/product/issues/272 [OCIS] old public webdav api doesnt works +# +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:50 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:51 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:71 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:72 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:92 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:93 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:114 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115 # # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work # @@ -1202,10 +1214,6 @@ apiWebdavProperties2/getFileProperties.feature:327 apiWebdavProperties2/getFileProperties.feature:328 apiWebdavProperties2/getFileProperties.feature:376 apiWebdavProperties2/getFileProperties.feature:377 -apiWebdavProperties2/getFileProperties.feature:389 -apiWebdavProperties2/getFileProperties.feature:390 -apiWebdavProperties2/getFileProperties.feature:402 -apiWebdavProperties2/getFileProperties.feature:403 apiWebdavProperties2/getFileProperties.feature:415 apiWebdavProperties2/getFileProperties.feature:416 apiWebdavProperties2/getFileProperties.feature:428 diff --git a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt index 73770c6db4..26d1d76c06 100644 --- a/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt +++ b/tests/acceptance/expected-failures-on-OWNCLOUD-storage.txt @@ -494,26 +494,38 @@ apiSharePublicLink2/updatePublicLinkShare.feature:94 apiSharePublicLink2/updatePublicLinkShare.feature:284 apiSharePublicLink2/updatePublicLinkShare.feature:285 # -# https://github.com/owncloud/ocis/issues/776 investigate ocis issues in apiSharePublicLink2/reShareAsPublicLinkToShares -# -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:25 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:26 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:47 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:48 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:63 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:64 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:78 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:79 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:100 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:101 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:123 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:124 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:140 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:141 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:161 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:162 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:184 -apiSharePublicLink2/reShareAsPublicLinkToShares.feature:185 +# https://github.com/owncloud/ocis/issues/270 [OCIS] share permissions not enforced +# +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:25 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:26 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:62 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:63 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:77 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:78 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:136 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:137 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:157 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:158 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:179 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:180 +# +# https://github.com/owncloud/ocis-reva/issues/292 Public link enforce permissions +# +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:97 +apiSharePublicLink2/reShareAsPublicLinkToSharesNewDav.feature:98 +# +# https://github.com/owncloud/product/issues/272 [OCIS] old public webdav api doesnt works +# +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:30 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:31 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:50 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:51 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:71 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:72 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:92 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:93 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:114 +apiSharePublicLink2/reShareAsPublicLinkToSharesOldDav.feature:115 # # https://github.com/owncloud/ocis-reva/issues/11 listing received shares does not work # @@ -1182,10 +1194,6 @@ apiWebdavProperties2/getFileProperties.feature:327 apiWebdavProperties2/getFileProperties.feature:328 apiWebdavProperties2/getFileProperties.feature:376 apiWebdavProperties2/getFileProperties.feature:377 -apiWebdavProperties2/getFileProperties.feature:389 -apiWebdavProperties2/getFileProperties.feature:390 -apiWebdavProperties2/getFileProperties.feature:402 -apiWebdavProperties2/getFileProperties.feature:403 apiWebdavProperties2/getFileProperties.feature:415 apiWebdavProperties2/getFileProperties.feature:416 apiWebdavProperties2/getFileProperties.feature:428 diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json index 8d98361e89..f962d9d8a6 100644 --- a/vendor-bin/behat/composer.json +++ b/vendor-bin/behat/composer.json @@ -1,7 +1,7 @@ { "config" : { "platform": { - "php": "7.2" + "php": "7.4" } }, "require": {