From 860bb793379e175210fae9fbd4325e12cd611209 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Aug 2020 10:02:18 +0545 Subject: [PATCH 1/5] [Tests-Only] Bump core commit id --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 099207f79..8f0e48c5b 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ config = { 'apiTests': { 'coreBranch': 'master', - 'coreCommit': '3f127eaf24ed539fd9effbc82db9b57df38e3157', + 'coreCommit': '5804220153fb311d37b5eda7440cfe7edc355166', 'numberOfParts': 2 } } From c68bc60181163b0f5673f6242dec872d0ef04108 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Aug 2020 10:33:03 +0545 Subject: [PATCH 2/5] Add trashbin scenarios to expected-failures-on-OC-storage.txt --- .../expected-failures-on-OC-storage.txt | 83 +++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/tests/acceptance/expected-failures-on-OC-storage.txt b/tests/acceptance/expected-failures-on-OC-storage.txt index 8255c03e8..10548fd0b 100644 --- a/tests/acceptance/expected-failures-on-OC-storage.txt +++ b/tests/acceptance/expected-failures-on-OC-storage.txt @@ -466,6 +466,89 @@ apiSharePublicLink2/uploadToPublicLinkShare.feature:255 # https://github.com/owncloud/ocis-reva/issues/286 Upload-only shares must not overwrite but create a separate file apiSharePublicLink2/uploadToPublicLinkShare.feature:273 # +# https://github.com/owncloud/ocis-reva/issues/286 Upload-only shares must not overwrite but create a separate file +apiSharePublicLink2/uploadToPublicLinkShare.feature:273 +# +apiTrashbin/trashbinDelete.feature:31 +apiTrashbin/trashbinDelete.feature:32 +apiTrashbin/trashbinDelete.feature:33 +apiTrashbin/trashbinDelete.feature:34 +apiTrashbin/trashbinDelete.feature:37 +apiTrashbin/trashbinDelete.feature:50 +apiTrashbin/trashbinDelete.feature:67 +# +apiTrashbin/trashbinFilesFolders.feature:21 +apiTrashbin/trashbinFilesFolders.feature:32 +apiTrashbin/trashbinFilesFolders.feature:44 +apiTrashbin/trashbinFilesFolders.feature:45 +apiTrashbin/trashbinFilesFolders.feature:60 +apiTrashbin/trashbinFilesFolders.feature:61 +apiTrashbin/trashbinFilesFolders.feature:75 +apiTrashbin/trashbinFilesFolders.feature:89 +apiTrashbin/trashbinFilesFolders.feature:90 +apiTrashbin/trashbinFilesFolders.feature:104 +apiTrashbin/trashbinFilesFolders.feature:105 +apiTrashbin/trashbinFilesFolders.feature:136 +apiTrashbin/trashbinFilesFolders.feature:137 +apiTrashbin/trashbinFilesFolders.feature:155 +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:270 +apiTrashbin/trashbinFilesFolders.feature:271 +apiTrashbin/trashbinFilesFolders.feature:272 +apiTrashbin/trashbinFilesFolders.feature:273 +apiTrashbin/trashbinFilesFolders.feature:274 +apiTrashbin/trashbinFilesFolders.feature:275 +apiTrashbin/trashbinFilesFolders.feature:276 +apiTrashbin/trashbinFilesFolders.feature:277 +apiTrashbin/trashbinFilesFolders.feature:278 +apiTrashbin/trashbinFilesFolders.feature:289 +# +apiTrashbin/trashbinRestore.feature:31 +apiTrashbin/trashbinRestore.feature:32 +apiTrashbin/trashbinRestore.feature:62 +apiTrashbin/trashbinRestore.feature:63 +apiTrashbin/trashbinRestore.feature:76 +apiTrashbin/trashbinRestore.feature:77 +apiTrashbin/trashbinRestore.feature:92 +apiTrashbin/trashbinRestore.feature:93 +apiTrashbin/trashbinRestore.feature:112 +apiTrashbin/trashbinRestore.feature:113 +apiTrashbin/trashbinRestore.feature:114 +apiTrashbin/trashbinRestore.feature:115 +apiTrashbin/trashbinRestore.feature:116 +apiTrashbin/trashbinRestore.feature:117 +apiTrashbin/trashbinRestore.feature:141 +apiTrashbin/trashbinRestore.feature:142 +apiTrashbin/trashbinRestore.feature:143 +apiTrashbin/trashbinRestore.feature:144 +apiTrashbin/trashbinRestore.feature:165 +apiTrashbin/trashbinRestore.feature:166 +apiTrashbin/trashbinRestore.feature:188 +apiTrashbin/trashbinRestore.feature:189 +apiTrashbin/trashbinRestore.feature:206 +apiTrashbin/trashbinRestore.feature:207 +apiTrashbin/trashbinRestore.feature:279 +apiTrashbin/trashbinRestore.feature:280 +apiTrashbin/trashbinRestore.feature:295 +apiTrashbin/trashbinRestore.feature:310 +apiTrashbin/trashbinRestore.feature:323 +apiTrashbin/trashbinRestore.feature:324 +apiTrashbin/trashbinRestore.feature:325 +apiTrashbin/trashbinRestore.feature:326 +apiTrashbin/trashbinRestore.feature:327 +apiTrashbin/trashbinRestore.feature:328 +apiTrashbin/trashbinRestore.feature:343 +apiTrashbin/trashbinRestore.feature:344 +# # https://github.com/owncloud/ocis-reva/issues/17 uploading with old-chunking does not work # https://github.com/owncloud/ocis-reva/issues/56 remote.php/dav/uploads endpoint does not exist apiVersions/fileVersions.feature:15 From 283272b33935fbbe8588381f43691424a46ffdc2 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Aug 2020 11:02:25 +0545 Subject: [PATCH 3/5] Do not run any local_storage API tests --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 8f0e48c5b..2a9e05d54 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', + 'BEHAT_FILTER_TAGS': '~@notToImplementOnOCIS&&~@toImplementOnOCIS&&~@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 726561cf1b21b4642f1b50a8b7d69053b621f684 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Aug 2020 11:42:40 +0545 Subject: [PATCH 4/5] Remove these passing trashbin tests from expected-failures-on-OC-storage --- tests/acceptance/expected-failures-on-OC-storage.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/acceptance/expected-failures-on-OC-storage.txt b/tests/acceptance/expected-failures-on-OC-storage.txt index 10548fd0b..e5185e419 100644 --- a/tests/acceptance/expected-failures-on-OC-storage.txt +++ b/tests/acceptance/expected-failures-on-OC-storage.txt @@ -501,9 +501,6 @@ apiTrashbin/trashbinFilesFolders.feature:241 apiTrashbin/trashbinFilesFolders.feature:242 apiTrashbin/trashbinFilesFolders.feature:255 apiTrashbin/trashbinFilesFolders.feature:256 -apiTrashbin/trashbinFilesFolders.feature:270 -apiTrashbin/trashbinFilesFolders.feature:271 -apiTrashbin/trashbinFilesFolders.feature:272 apiTrashbin/trashbinFilesFolders.feature:273 apiTrashbin/trashbinFilesFolders.feature:274 apiTrashbin/trashbinFilesFolders.feature:275 From 20d2260b6b1bb603831880a52f6cbe976eb40e51 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Tue, 25 Aug 2020 13:20:33 +0545 Subject: [PATCH 5/5] Bump core commit to include core PR 37844 --- .drone.star | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 2a9e05d54..1e8634701 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ config = { 'apiTests': { 'coreBranch': 'master', - 'coreCommit': '5804220153fb311d37b5eda7440cfe7edc355166', + 'coreCommit': 'd65b8b5eefa0a59c8e9487196807d50588db698c', 'numberOfParts': 2 } }