From 249191007e0f07572c1f6ec8ccd835602efd4a5f Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 2 Sep 2020 08:19:20 +0545 Subject: [PATCH 1/4] Bump core commit 20200902 --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index c4b45301f5..f3d0df04b6 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ config = { 'apiTests': { 'coreBranch': 'master', - 'coreCommit': '7b6a4cf6dab990d1624042589d22e348e027b74b', + 'coreCommit': '175ced019d71973b03afbefc6e79172a39ae9e28', 'numberOfParts': 2 } } From 2c17012428c1be9fe3fcfc397ac32ba009753116 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 2 Sep 2020 10:33:08 +0545 Subject: [PATCH 2/4] Adjust line numbers of trashbinFilesFolders scenarios --- .../expected-failures-on-OC-storage.txt | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/acceptance/expected-failures-on-OC-storage.txt b/tests/acceptance/expected-failures-on-OC-storage.txt index b6d70902b0..0827df8643 100644 --- a/tests/acceptance/expected-failures-on-OC-storage.txt +++ b/tests/acceptance/expected-failures-on-OC-storage.txt @@ -491,16 +491,16 @@ apiTrashbin/trashbinFilesFolders.feature:104 apiTrashbin/trashbinFilesFolders.feature:105 apiTrashbin/trashbinFilesFolders.feature:136 apiTrashbin/trashbinFilesFolders.feature:137 -apiTrashbin/trashbinFilesFolders.feature:185 -apiTrashbin/trashbinFilesFolders.feature:186 -apiTrashbin/trashbinFilesFolders.feature:203 -apiTrashbin/trashbinFilesFolders.feature:204 -apiTrashbin/trashbinFilesFolders.feature:227 -apiTrashbin/trashbinFilesFolders.feature:228 -apiTrashbin/trashbinFilesFolders.feature:241 -apiTrashbin/trashbinFilesFolders.feature:242 -apiTrashbin/trashbinFilesFolders.feature:255 -apiTrashbin/trashbinFilesFolders.feature:256 +apiTrashbin/trashbinFilesFolders.feature:217 +apiTrashbin/trashbinFilesFolders.feature:218 +apiTrashbin/trashbinFilesFolders.feature:235 +apiTrashbin/trashbinFilesFolders.feature:236 +apiTrashbin/trashbinFilesFolders.feature:259 +apiTrashbin/trashbinFilesFolders.feature:260 +apiTrashbin/trashbinFilesFolders.feature:273 +apiTrashbin/trashbinFilesFolders.feature:274 +apiTrashbin/trashbinFilesFolders.feature:287 +apiTrashbin/trashbinFilesFolders.feature:288 # # https://github.com/owncloud/product/issues/179 Propfind to trashbin endpoint requires UUID # https://github.com/owncloud/product/issues/178 File deletion using dav gives unique string in filename in the trashbin From 4c7ba5b45eb690ebb5f1b5eabec1c219175cc43d Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 2 Sep 2020 15:18:44 +0545 Subject: [PATCH 3/4] Do not run comments, federation, notifications, systemtags tests --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index f3d0df04b6..1d1995e838 100644 --- a/.drone.star +++ b/.drone.star @@ -119,7 +119,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', - 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@preview-extension-required&&~@local_storage', + 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@preview-extension-required&&~@local_storage', 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-on-OC-storage.txt' From 2561a115c8293a3670f6ebedc6fa0b299b7c8e9e Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Wed, 2 Sep 2020 22:16:22 +0545 Subject: [PATCH 4/4] Do not run provisioning API tests --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 1d1995e838..daa6c07b0c 100644 --- a/.drone.star +++ b/.drone.star @@ -119,7 +119,7 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'TEST_EXTERNAL_USER_BACKENDS':'true', 'REVA_LDAP_HOSTNAME':'ldap', 'TEST_OCIS':'true', - 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~comments-app-required&&~@federation-app-required&&~@notifications-app-required&&~systemtags-app-required&&~@preview-extension-required&&~@local_storage', + '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', 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, 'EXPECTED_FAILURES_FILE': '/drone/src/tests/acceptance/expected-failures-on-OC-storage.txt'